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

decoder/ffmpeg: use more references

Browse Source
This commit is contained in:
Max Kellermann 2014-12-19 10:03:35 +01:00
parent 0ff22a16fa
commit cc19e760cf
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -321,7 +321,7 @@ ffmpeg_send_packet(Decoder &decoder, InputStream &is,
AVPacket &&packet, AVPacket &&packet,
AVCodecContext &codec_context, AVCodecContext &codec_context,
const AVStream &stream, const AVStream &stream,
AVFrame *frame, AVFrame &frame,
uint64_t min_frame, size_t pcm_frame_size, uint64_t min_frame, size_t pcm_frame_size,
FfmpegBuffer &buffer) FfmpegBuffer &buffer)
{ {
@ -346,7 +346,7 @@ ffmpeg_send_packet(Decoder &decoder, InputStream &is,
while (packet.size > 0 && cmd == DecoderCommand::NONE) { while (packet.size > 0 && cmd == DecoderCommand::NONE) {
int got_frame = 0; int got_frame = 0;
int len = avcodec_decode_audio4(&codec_context, int len = avcodec_decode_audio4(&codec_context,
frame, &got_frame, &frame, &got_frame,
&packet); &packet);
if (len < 0) { if (len < 0) {
/* if error, we skip the frame */ /* if error, we skip the frame */
@ -357,11 +357,11 @@ ffmpeg_send_packet(Decoder &decoder, InputStream &is,
packet.data += len; packet.data += len;
packet.size -= len; packet.size -= len;
if (!got_frame || frame->nb_samples <= 0) if (!got_frame || frame.nb_samples <= 0)
continue; continue;
auto output_buffer = auto output_buffer =
copy_interleave_frame(codec_context, *frame, copy_interleave_frame(codec_context, frame,
buffer, error); buffer, error);
if (output_buffer.IsNull()) { if (output_buffer.IsNull()) {
/* this must be a serious error, /* this must be a serious error,
@ -394,7 +394,7 @@ ffmpeg_send_packet(Decoder &decoder, InputStream &is,
const AVPacket &packet, const AVPacket &packet,
AVCodecContext &codec_context, AVCodecContext &codec_context,
const AVStream &stream, const AVStream &stream,
AVFrame *frame, AVFrame &frame,
uint64_t min_frame, size_t pcm_frame_size, uint64_t min_frame, size_t pcm_frame_size,
FfmpegBuffer &buffer) FfmpegBuffer &buffer)
{ {
@ -527,9 +527,9 @@ ffmpeg_decode(Decoder &decoder, InputStream &input)
return; return;
} }
AVStream *av_stream = format_context->streams[audio_stream]; AVStream &av_stream = *format_context->streams[audio_stream];
AVCodecContext *codec_context = av_stream->codec; AVCodecContext *codec_context = av_stream.codec;
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54, 25, 0) #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54, 25, 0)
const AVCodecDescriptor *codec_descriptor = const AVCodecDescriptor *codec_descriptor =
@ -617,8 +617,8 @@ ffmpeg_decode(Decoder &decoder, InputStream &input)
cmd = ffmpeg_send_packet(decoder, input, cmd = ffmpeg_send_packet(decoder, input,
packet, packet,
*codec_context, *codec_context,
*av_stream, av_stream,
frame, *frame,
min_frame, audio_format.GetFrameSize(), min_frame, audio_format.GetFrameSize(),
interleaved_buffer); interleaved_buffer);
min_frame = 0; min_frame = 0;
@ -634,8 +634,8 @@ ffmpeg_decode(Decoder &decoder, InputStream &input)
if (cmd == DecoderCommand::SEEK) { if (cmd == DecoderCommand::SEEK) {
int64_t where = int64_t where =
ToFfmpegTime(decoder_seek_time(decoder), ToFfmpegTime(decoder_seek_time(decoder),
av_stream->time_base) + av_stream.time_base) +
start_time_fallback(*av_stream); start_time_fallback(av_stream);
/* AVSEEK_FLAG_BACKWARD asks FFmpeg to seek to /* AVSEEK_FLAG_BACKWARD asks FFmpeg to seek to
the packet boundary before the seek time the packet boundary before the seek time