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

decoder/ffmpeg: move code to FfmpegSendFrame()

Browse Source
This commit is contained in:
Max Kellermann 2016-07-27 17:10:39 +02:00
parent f31fe8b865
commit 70986bc120
1 changed files with 41 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/decoder/plugins/FfmpegDecoderPlugin.cxx
View File

@ -173,6 +173,43 @@ PtsToPcmFrame(uint64_t pts, const AVStream &stream,
return av_rescale_q(pts, stream.time_base, codec_context.time_base); return av_rescale_q(pts, stream.time_base, codec_context.time_base);
} }
/**
* Invoke decoder_data() with the contents of an #AVFrame.
*/
static DecoderCommand
FfmpegSendFrame(Decoder &decoder, InputStream &is,
AVCodecContext &codec_context,
const AVFrame &frame,
size_t &skip_bytes,
FfmpegBuffer &buffer)
{
Error error;
auto output_buffer =
copy_interleave_frame(codec_context, frame,
buffer, error);
if (output_buffer.IsNull()) {
/* this must be a serious error, e.g. OOM */
LogError(error);
return DecoderCommand::STOP;
}
if (skip_bytes > 0) {
if (skip_bytes >= output_buffer.size) {
skip_bytes -= output_buffer.size;
return DecoderCommand::NONE;
}
output_buffer.data =
(const uint8_t *)output_buffer.data + skip_bytes;
output_buffer.size -= skip_bytes;
skip_bytes = 0;
}
return decoder_data(decoder, is,
output_buffer.data, output_buffer.size,
codec_context.bit_rate / 1000);
}
/** /**
* Decode an #AVPacket and send the resulting PCM data to the decoder * Decode an #AVPacket and send the resulting PCM data to the decoder
* API. * API.
@ -205,8 +242,6 @@ ffmpeg_send_packet(Decoder &decoder, InputStream &is,
stream.time_base)); stream.time_base));
} }
Error error;
DecoderCommand cmd = DecoderCommand::NONE; DecoderCommand cmd = DecoderCommand::NONE;
while (packet.size > 0 && cmd == DecoderCommand::NONE) { while (packet.size > 0 && cmd == DecoderCommand::NONE) {
int got_frame = 0; int got_frame = 0;
@ -225,32 +260,11 @@ ffmpeg_send_packet(Decoder &decoder, InputStream &is,
if (!got_frame || frame.nb_samples <= 0) if (!got_frame || frame.nb_samples <= 0)
continue; continue;
auto output_buffer = cmd = FfmpegSendFrame(decoder, is, codec_context,
copy_interleave_frame(codec_context, frame, frame, skip_bytes,
buffer, error); buffer);
if (output_buffer.IsNull()) {
/* this must be a serious error,
e.g. OOM */
LogError(error);
return DecoderCommand::STOP;
} }
if (skip_bytes > 0) {
if (skip_bytes >= output_buffer.size) {
skip_bytes -= output_buffer.size;
continue;
}
output_buffer.data =
(const uint8_t *)output_buffer.data + skip_bytes;
output_buffer.size -= skip_bytes;
skip_bytes = 0;
}
cmd = decoder_data(decoder, is,
output_buffer.data, output_buffer.size,
codec_context.bit_rate / 1000);
}
return cmd; return cmd;
} }