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

libeplayer3: fix audio recoding, yt aac stuttering should be gone now

Browse Source
This commit is contained in:
martii
2013-12-09 12:15:37 +01:00
parent 21a984f1a1
commit f840fb0c60
1 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
libeplayer3/container/container_ffmpeg.c
View File

@@ -532,6 +532,12 @@ static void FFMPEGThread(Context_t * context)
} }
context->output->Command(context, OUTPUT_CLEAR, NULL); context->output->Command(context, OUTPUT_CLEAR, NULL);
context->output->Command(context, OUTPUT_PLAY, NULL); context->output->Command(context, OUTPUT_PLAY, NULL);
AVCodec *codec =
avcodec_find_decoder(c->codec_id);
if (!codec || avcodec_open2(c, codec, NULL))
fprintf(stderr, "%s %d: avcodec_open2 failed\n", __func__, __LINE__);
} }
while (packet.size > 0) { while (packet.size > 0) {
@@ -548,6 +554,7 @@ static void FFMPEGThread(Context_t * context)
avcodec_decode_audio4(c, decoded_frame, &got_frame, avcodec_decode_audio4(c, decoded_frame, &got_frame,
&packet); &packet);
if (len < 0) { if (len < 0) {
restart_audio_resampling = 1;
// fprintf(stderr, "avcodec_decode_audio4: %d\n", len); // fprintf(stderr, "avcodec_decode_audio4: %d\n", len);
break; break;
} }
@@ -905,6 +912,10 @@ static int interrupt_cb(void *ctx)
return p->abortRequested; return p->abortRequested;
} }
static void log_callback(void *ptr __attribute__ ((unused)), int lvl __attribute__ ((unused)), const char *format, va_list ap)
{
vfprintf(stderr, format, ap);
}
int container_ffmpeg_init(Context_t * context, char *filename) int container_ffmpeg_init(Context_t * context, char *filename)
{ {
@@ -912,6 +923,8 @@ int container_ffmpeg_init(Context_t * context, char *filename)
ffmpeg_printf(10, ">\n"); ffmpeg_printf(10, ">\n");
av_log_set_callback(log_callback);
if (filename == NULL) { if (filename == NULL) {
ffmpeg_err("filename NULL\n"); ffmpeg_err("filename NULL\n");
@@ -956,8 +969,10 @@ int container_ffmpeg_init(Context_t * context, char *filename)
avContext->iformat->flags |= AVFMT_SEEK_TO_PTS; avContext->iformat->flags |= AVFMT_SEEK_TO_PTS;
avContext->flags = AVFMT_FLAG_GENPTS; avContext->flags = AVFMT_FLAG_GENPTS;
if (context->playback->noprobe) if (context->playback->noprobe) {
ffmpeg_printf(10, "noprobe\n");
avContext->max_analyze_duration = 1; avContext->max_analyze_duration = 1;
}
ffmpeg_printf(20, "find_streaminfo\n"); ffmpeg_printf(20, "find_streaminfo\n");
@@ -1159,16 +1174,6 @@ int container_ffmpeg_update_tracks(Context_t * context, char *filename,
track.inject_as_pcm = 1; track.inject_as_pcm = 1;
ffmpeg_printf(10, " Handle inject_as_pcm = %d\n", ffmpeg_printf(10, " Handle inject_as_pcm = %d\n",
track.inject_as_pcm); track.inject_as_pcm);
AVCodec *codec =
avcodec_find_decoder(stream->codec->codec_id);
//( (AVStream*) audioTrack->stream)->codec->flags |= CODEC_FLAG_TRUNCATED;
if (codec != NULL
&& !avcodec_open2(stream->codec, codec, NULL))
printf("AVCODEC__INIT__SUCCESS\n");
else
printf("AVCODEC__INIT__FAILED\n");
} }
#if 0 #if 0
else if (stream->codec->codec_id == AV_CODEC_ID_AAC) { else if (stream->codec->codec_id == AV_CODEC_ID_AAC) {