oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

ffmpeg: use return value of decoder_data()

Browse Source 
decoder_data() always returns the current command.  If we use this, we
can save a lot of decoder_get_command() calls.
This commit is contained in:
Max Kellermann
2008-10-30 19:03:41 +01:00
parent f3b4a28518
commit b15c4cdeb5
1 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/decoder/ffmpeg_plugin.c
View File

@@ -213,7 +213,7 @@ ffmpeg_try_decode(struct input_stream *input)
return input->seekable && ffmpeg_helper(input, NULL, NULL); return input->seekable && ffmpeg_helper(input, NULL, NULL);
} }
static void static enum decoder_command
ffmpeg_send_packet(struct decoder *decoder, const AVPacket *packet, ffmpeg_send_packet(struct decoder *decoder, const AVPacket *packet,
AVCodecContext *codec_context, AVCodecContext *codec_context,
const AVRational *time_base) const AVRational *time_base)
@@ -233,12 +233,12 @@ ffmpeg_send_packet(struct decoder *decoder, const AVPacket *packet,
if (len < 0) { if (len < 0) {
WARNING("skipping frame!\n"); WARNING("skipping frame!\n");
return; return decoder_get_command(decoder);
} }
assert(audio_size >= 0); assert(audio_size >= 0);
decoder_data(decoder, NULL, 1, return decoder_data(decoder, NULL, 1,
audio_buf, audio_size, audio_buf, audio_size,
position, position,
codec_context->bit_rate / 1000, NULL); codec_context->bit_rate / 1000, NULL);
@@ -252,6 +252,7 @@ ffmpeg_decode_internal(BasePtrs *base)
AVFormatContext *pFormatCtx = base->pFormatCtx; AVFormatContext *pFormatCtx = base->pFormatCtx;
AVPacket packet; AVPacket packet;
struct audio_format audio_format; struct audio_format audio_format;
enum decoder_command cmd;
int current, total_time; int current, total_time;
total_time = 0; total_time = 0;
@@ -272,8 +273,19 @@ ffmpeg_decode_internal(BasePtrs *base)
decoder_initialized(decoder, &audio_format, total_time); decoder_initialized(decoder, &audio_format, total_time);
do { do {
if (av_read_frame(pFormatCtx, &packet) < 0)
/* end of file */
break;
if (decoder_get_command(decoder) == DECODE_COMMAND_SEEK) { if (packet.stream_index == base->audioStream)
cmd = ffmpeg_send_packet(decoder, &packet, aCodecCtx,
&pFormatCtx->streams[base->audioStream]->time_base);
else
cmd = decoder_get_command(decoder);
av_free_packet(&packet);
if (cmd == DECODE_COMMAND_SEEK) {
current = decoder_seek_where(decoder) * AV_TIME_BASE; current = decoder_seek_where(decoder) * AV_TIME_BASE;
if (av_seek_frame(pFormatCtx, -1, current, 0) < 0) if (av_seek_frame(pFormatCtx, -1, current, 0) < 0)
@@ -281,17 +293,7 @@ ffmpeg_decode_internal(BasePtrs *base)
else else
decoder_command_finished(decoder); decoder_command_finished(decoder);
} }
} while (cmd != DECODE_COMMAND_STOP);
if (av_read_frame(pFormatCtx, &packet) < 0)
/* end of file */
break;
if (packet.stream_index == base->audioStream)
ffmpeg_send_packet(decoder, &packet, aCodecCtx,
&pFormatCtx->streams[base->audioStream]->time_base);
av_free_packet(&packet);
} while (decoder_get_command(decoder) != DECODE_COMMAND_STOP);
return true; return true;
} }