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

libeplayer/container_ffmpeg: use injected PCM for raw PCM, too

Browse Source
This commit is contained in:
martii
2013-03-17 09:47:18 +01:00
parent bd87abd06b
commit 1a499b7054
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libeplayer3/container/container_ffmpeg.c
View File

@@ -280,7 +280,11 @@ static char* Codec2Encoding(enum CodecID id, int* version)
#else #else
case CODEC_ID_PCM_S16LE: case CODEC_ID_PCM_S16LE:
#endif #endif
#ifdef MARTII
return "A_IPCM";
#else
return "A_PCM"; return "A_PCM";
#endif
/* subtitle */ /* subtitle */
case CODEC_ID_SSA: case CODEC_ID_SSA:
return "S_TEXT/ASS"; /* Hellmaster1024: seems to be ASS instead of SSA */ return "S_TEXT/ASS"; /* Hellmaster1024: seems to be ASS instead of SSA */
@@ -1800,12 +1804,12 @@ int container_ffmpeg_init(Context_t *context, char * filename)
track.duration = (double) stream->duration * av_q2d(stream->time_base) * 1000.0; track.duration = (double) stream->duration * av_q2d(stream->time_base) * 1000.0;
} }
#ifndef MARTII
if(!strncmp(encoding, "A_PCM", 5)) if(!strncmp(encoding, "A_PCM", 5))
{ {
track.inject_raw_pcm = 1; track.inject_raw_pcm = 1;
ffmpeg_printf(10, " Handle inject_raw_pcm = %d\n", track.inject_as_pcm); ffmpeg_printf(10, " Handle inject_raw_pcm = %d\n", track.inject_as_pcm);
} }
#ifdef MARTII
else else
#endif #endif
if(!strncmp(encoding, "A_IPCM", 6)) if(!strncmp(encoding, "A_IPCM", 6))
@@ -1824,8 +1828,8 @@ int container_ffmpeg_init(Context_t *context, char * filename)
printf("AVCODEC__INIT__SUCCESS\n"); printf("AVCODEC__INIT__SUCCESS\n");
else else
printf("AVCODEC__INIT__FAILED\n"); printf("AVCODEC__INIT__FAILED\n");
#ifndef MARTII
} }
#ifndef MARTII
else if(stream->codec->codec_id == CODEC_ID_AAC) { else if(stream->codec->codec_id == CODEC_ID_AAC) {
ffmpeg_printf(10,"Create AAC ExtraData\n"); ffmpeg_printf(10,"Create AAC ExtraData\n");
ffmpeg_printf(10,"stream->codec->extradata_size %d\n", stream->codec->extradata_size); ffmpeg_printf(10,"stream->codec->extradata_size %d\n", stream->codec->extradata_size);
@@ -1971,8 +1975,8 @@ int container_ffmpeg_init(Context_t *context, char * filename)
//Hexdump(stream->codec->priv_data, track.aacbuflen); //Hexdump(stream->codec->priv_data, track.aacbuflen);
track.have_aacheader = 1; track.have_aacheader = 1;
#endif
} }
#endif
if (context->manager->audio) if (context->manager->audio)
{ {