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

decoder/ffmpeg: use AVFrame fields instead of AVCodecContext fields

Browse Source
This commit is contained in:
Max Kellermann 2020-11-04 19:57:25 +01:00
parent 42c9d765cf
commit 7a0342c8bb
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -182,25 +182,24 @@ start_time_fallback(const AVStream &stream)
* Throws #std::exception on error. * Throws #std::exception on error.
*/ */
static ConstBuffer<void> static ConstBuffer<void>
copy_interleave_frame(const AVCodecContext &codec_context, copy_interleave_frame(const AVFrame &frame, FfmpegBuffer &global_buffer)
const AVFrame &frame,
FfmpegBuffer &global_buffer)
{ {
assert(frame.nb_samples > 0); assert(frame.nb_samples > 0);
const AVSampleFormat format = AVSampleFormat(frame.format);
const unsigned channels = frame.channels;
const std::size_t n_frames = frame.nb_samples;
int plane_size; int plane_size;
const int data_size = const int data_size =
av_samples_get_buffer_size(&plane_size, av_samples_get_buffer_size(&plane_size, channels,
codec_context.channels, n_frames, format, 1);
frame.nb_samples,
codec_context.sample_fmt, 1);
assert(data_size != 0); assert(data_size != 0);
if (data_size < 0) if (data_size < 0)
throw MakeFfmpegError(data_size); throw MakeFfmpegError(data_size);
void *output_buffer; void *output_buffer;
if (av_sample_fmt_is_planar(codec_context.sample_fmt) && if (av_sample_fmt_is_planar(format) && channels > 1) {
codec_context.channels > 1) {
output_buffer = global_buffer.GetT<uint8_t>(data_size); output_buffer = global_buffer.GetT<uint8_t>(data_size);
if (output_buffer == nullptr) if (output_buffer == nullptr)
/* Not enough memory - shouldn't happen */ /* Not enough memory - shouldn't happen */
@ -208,9 +207,9 @@ copy_interleave_frame(const AVCodecContext &codec_context,
PcmInterleave(output_buffer, PcmInterleave(output_buffer,
ConstBuffer<const void *>((const void *const*)frame.extended_data, ConstBuffer<const void *>((const void *const*)frame.extended_data,
codec_context.channels), channels),
frame.nb_samples, n_frames,
av_get_bytes_per_sample(codec_context.sample_fmt)); av_get_bytes_per_sample(format));
} else { } else {
output_buffer = frame.extended_data[0]; output_buffer = frame.extended_data[0];
} }
@ -257,8 +256,7 @@ FfmpegSendFrame(DecoderClient &client, InputStream *is,
size_t &skip_bytes, size_t &skip_bytes,
FfmpegBuffer &buffer) FfmpegBuffer &buffer)
{ {
ConstBuffer<void> output_buffer = ConstBuffer<void> output_buffer = copy_interleave_frame(frame, buffer);
copy_interleave_frame(codec_context, frame, buffer);
if (skip_bytes > 0) { if (skip_bytes > 0) {
if (skip_bytes >= output_buffer.size) { if (skip_bytes >= output_buffer.size) {