mirrors/libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/libstb-hal.git synced 2025-08-27 15:33:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

libeplayer3: sync with tdt git commit fed2a419dc

Browse Source
This commit is contained in:
Stefan Seyfried
2012-10-03 23:51:56 +02:00
parent 4d43213158
commit 173ef3230a
32 changed files with 314 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libeplayer3/output/linuxdvb.c
View File

@@ -601,8 +601,8 @@ int LinuxDvbFastForward(Context_t *context, char * type) {
int LinuxDvbReverse(Context_t *context, char * type) {
#ifdef reverse_playback_2
int ret = cERR_LINUXDVB_NO_ERROR;
#ifdef reverse_playback_2
int speed;
unsigned char video = !strcmp("video", type);
@@ -654,8 +654,8 @@ int LinuxDvbReverse(Context_t *context, char * type) {
linuxdvb_printf(10, "exiting with value %d\n", ret);
return ret;
#endif
return ret;
}
int LinuxDvbSlowMotion(Context_t *context, char * type) {
@@ -1204,7 +1204,5 @@ struct Output_s LinuxDvbOutput = {
"LinuxDvb",
&Command,
&Write,
LinuxDvbCapabilities,
LinuxDvbCapabilities
};

2
libeplayer3/output/output.c
View File

@@ -349,5 +349,5 @@ OutputHandler_t OutputHandler = {
NULL,
NULL,
NULL,
&Command,
&Command
};

4
libeplayer3/output/output_subtitle.c
View File

@@ -839,7 +839,5 @@ struct Output_s SubtitleOutput = {
"Subtitle",
&Command,
&Write,
SubtitleCapabilitis,
SubtitleCapabilitis
};

5
libeplayer3/output/writer/ac3.c
View File

@@ -140,13 +140,12 @@ static WriterCaps_t caps_ac3 = {
"ac3",
eAudio,
"A_AC3",
AUDIO_ENCODING_AC3,
AUDIO_ENCODING_AC3
};
struct Writer_s WriterAudioAC3 = {
&reset,
&writeData,
NULL,
&caps_ac3,
&caps_ac3
};

12
libeplayer3/output/writer/divx.c
View File

@@ -177,40 +177,40 @@ static WriterCaps_t mpeg4p2_caps = {
"mscomp",
eVideo,
"V_MSCOMP",
VIDEO_ENCODING_MPEG4P2,
VIDEO_ENCODING_MPEG4P2
};
struct Writer_s WriterVideoMSCOMP = {
&reset,
&writeData,
NULL,
&mpeg4p2_caps,
&mpeg4p2_caps
};
static WriterCaps_t fourcc_caps = {
"fourcc",
eVideo,
"V_MS/VFW/FOURCC",
VIDEO_ENCODING_MPEG4P2,
VIDEO_ENCODING_MPEG4P2
};
struct Writer_s WriterVideoFOURCC = {
&reset,
&writeData,
NULL,
&fourcc_caps,
&fourcc_caps
};
static WriterCaps_t divx_caps = {
"divx",
eVideo,
"V_MKV/XVID",
VIDEO_ENCODING_MPEG4P2,
VIDEO_ENCODING_MPEG4P2
};
struct Writer_s WriterVideoDIVX = {
&reset,
&writeData,
NULL,
&divx_caps,
&divx_caps
};

4
libeplayer3/output/writer/dts.c
View File

@@ -158,12 +158,12 @@ static WriterCaps_t caps = {
"dts",
eAudio,
"A_DTS",
AUDIO_ENCODING_DTS,
AUDIO_ENCODING_DTS
};
struct Writer_s WriterAudioDTS = {
&reset,
&writeData,
NULL,
&caps,
&caps
};

5
libeplayer3/output/writer/flac.c
View File

@@ -140,13 +140,12 @@ static WriterCaps_t caps_flac = {
"flac",
eAudio,
"A_FLAC",
AUDIO_ENCODING_LPCM, //AUDIO_ENCODING_FLAC,
AUDIO_ENCODING_LPCM //AUDIO_ENCODING_FLAC
};
struct Writer_s WriterAudioFLAC = {
&reset,
&writeData,
NULL,
&caps_flac,
&caps_flac
};

4
libeplayer3/output/writer/framebuffer.c
View File

@@ -186,12 +186,12 @@ static WriterCaps_t caps = {
"framebuffer",
eGfx,
"framebuffer",
0,
0
};
struct Writer_s WriterFramebuffer = {
&reset,
&writeData,
NULL,
&caps,
&caps
};

26
libeplayer3/output/writer/h263.c
View File

@@ -93,7 +93,6 @@ static int writeData(void* _call)
WriterAVCallData_t* call = (WriterAVCallData_t*) _call;
unsigned char PesHeader[PES_MAX_HEADER_SIZE];
unsigned char DataCopy[PES_MAX_HEADER_SIZE];
int len = 0;
h263_printf(10, "\n");
@@ -131,14 +130,21 @@ static int writeData(void* _call)
HeaderLength += PrivateHeaderLength;
unsigned char *PacketData = call->data - HeaderLength;
unsigned char *PacketData = malloc(HeaderLength + call->len);
memcpy(DataCopy, PacketData, HeaderLength);
memcpy(PacketData, PesHeader, HeaderLength);
if(PacketData != NULL)
{
memcpy(PacketData, PesHeader, HeaderLength);
memcpy(PacketData + HeaderLength, call->data, call->len);
len = write(call->fd, PacketData, call->len + HeaderLength);
len = write(call->fd, PacketData, call->len + HeaderLength);
memcpy(PacketData, DataCopy, HeaderLength);
free(PacketData);
}
else
{
h263_err("no mem\n");
}
h263_printf(10, "< len %d\n", len);
return len;
@@ -152,26 +158,26 @@ static WriterCaps_t caps_h263 = {
"h263",
eVideo,
"V_H263",
VIDEO_ENCODING_H263,
VIDEO_ENCODING_H263
};
struct Writer_s WriterVideoH263 = {
&reset,
&writeData,
NULL,
&caps_h263,
&caps_h263
};
static WriterCaps_t caps_flv = {
"FLV",
eVideo,
"V_FLV",
VIDEO_ENCODING_FLV1,
VIDEO_ENCODING_FLV1
};
struct Writer_s WriterVideoFLV = {
&reset,
&writeData,
NULL,
&caps_flv,
&caps_flv
};

5
libeplayer3/output/writer/h264.c
View File

@@ -428,13 +428,12 @@ static WriterCaps_t caps = {
"h264",
eVideo,
"V_MPEG4/ISO/AVC",
VIDEO_ENCODING_H264,
VIDEO_ENCODING_H264
};
struct Writer_s WriterVideoH264 = {
&reset,
&writeData,
&writeReverseData,
&caps,
&caps
};

1
libeplayer3/output/writer/misc.c
View File

@@ -123,4 +123,3 @@ void FlushBits(BitPacker_t * ld)
ld->Remaining = 32;
ld->BitBuffer = 0;
}

8
libeplayer3/output/writer/mp3.c
View File

@@ -140,26 +140,26 @@ static WriterCaps_t caps_mp3 = {
"mp3",
eAudio,
"A_MP3",
AUDIO_ENCODING_MP3,
AUDIO_ENCODING_MP3
};
struct Writer_s WriterAudioMP3 = {
&reset,
&writeData,
NULL,
&caps_mp3,
&caps_mp3
};
static WriterCaps_t caps_mpegl3 = {
"mpeg/l3",
eAudio,
"A_MPEG/L3",
AUDIO_ENCODING_MPEG2,
AUDIO_ENCODING_MPEG2
};
struct Writer_s WriterAudioMPEGL3 = {
&reset,
&writeData,
NULL,
&caps_mpegl3,
&caps_mpegl3
};

8
libeplayer3/output/writer/mpeg2.c
View File

@@ -154,26 +154,26 @@ static WriterCaps_t caps = {
"mpeg2",
eVideo,
"V_MPEG2",
VIDEO_ENCODING_AUTO,
VIDEO_ENCODING_AUTO
};
struct Writer_s WriterVideoMPEG2 = {
&reset,
&writeData,
NULL,
&caps,
&caps
};
static WriterCaps_t h264_caps = {
"mpges_h264",
eVideo,
"V_MPEG2/H264",
VIDEO_ENCODING_H264,
VIDEO_ENCODING_H264
};
struct Writer_s WriterVideoMPEGH264 = {
&reset,
&writeData,
NULL,
&h264_caps,
&h264_caps
};

9
libeplayer3/output/writer/pcm.c
View File

@@ -320,27 +320,26 @@ static WriterCaps_t caps_pcm = {
"pcm",
eAudio,
"A_PCM",
AUDIO_ENCODING_LPCMA,
AUDIO_ENCODING_LPCMA
};
struct Writer_s WriterAudioPCM = {
&reset,
&writeData,
NULL,
&caps_pcm,
&caps_pcm
};
static WriterCaps_t caps_ipcm = {
"ipcm",
eAudio,
"A_IPCM",
AUDIO_ENCODING_LPCMA,
AUDIO_ENCODING_LPCMA
};
struct Writer_s WriterAudioIPCM = {
&reset,
&writeData,
NULL,
&caps_ipcm,
&caps_ipcm
};

1
libeplayer3/output/writer/vc1.c
View File

@@ -290,4 +290,3 @@ struct Writer_s WriterVideoVC1 = {
NULL,
&caps
};

5
libeplayer3/output/writer/vorbis.c
View File

@@ -140,13 +140,12 @@ static WriterCaps_t caps_vorbis = {
"vorbis",
eAudio,
"A_VORBIS",
AUDIO_ENCODING_VORBIS,
AUDIO_ENCODING_VORBIS
};
struct Writer_s WriterAudioVORBIS = {
&reset,
&writeData,
NULL,
&caps_vorbis,
&caps_vorbis
};

1
libeplayer3/output/writer/wmv.c
View File

@@ -278,4 +278,3 @@ struct Writer_s WriterVideoWMV = {
NULL,
&caps
};

1
libeplayer3/output/writer/writer.c
View File

@@ -138,4 +138,3 @@ Writer_t* getDefaultFramebufferWriter()
return NULL;
}