mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-03-28 20:05:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

avauddec: fix decoding of mono audio as well

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=690940
This commit is contained in:
Tim-Philipp Müller 2013-01-26 12:50:49 +00:00
parent 76423a4ba7
commit 879cd02e26
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
ext/libav/gstavauddec.c
View file

@ -436,6 +436,8 @@ gst_ffmpegauddec_audio_frame (GstFFMpegAudDec * ffmpegdec,
if (len >= 0 && have_data > 0) {
BufferInfo *buffer_info = frame.opaque;
gint nsamples, channels, byte_per_sample;
gsize output_size;
if (!gst_ffmpegauddec_negotiate (ffmpegdec, FALSE)) {
*outbuf = NULL;
@ -444,6 +446,13 @@ gst_ffmpegauddec_audio_frame (GstFFMpegAudDec * ffmpegdec,
goto beach;
}
channels = ffmpegdec->info.channels;
nsamples = frame.nb_samples;
byte_per_sample = ffmpegdec->info.finfo->width / 8;
/* frame.linesize[0] might contain padding, allocate only what's needed */
output_size = nsamples * byte_per_sample * channels;
GST_DEBUG_OBJECT (ffmpegdec, "Creating output buffer");
if (buffer_info) {
*outbuf = buffer_info->buffer;
@ -451,19 +460,14 @@ gst_ffmpegauddec_audio_frame (GstFFMpegAudDec * ffmpegdec,
g_slice_free (BufferInfo, buffer_info);
frame.opaque = NULL;
} else if (av_sample_fmt_is_planar (ffmpegdec->context->sample_fmt)
&& ffmpegdec->info.channels > 1) {
&& channels > 1) {
gint i, j;
gint nsamples, channels, byte_per_sample;
GstMapInfo minfo;
channels = ffmpegdec->info.channels;
nsamples = frame.nb_samples;
byte_per_sample = ffmpegdec->info.finfo->width / 8;
/* note: linesize[0] might contain padding, allocate only what's needed */
*outbuf =
gst_audio_decoder_allocate_output_buffer (GST_AUDIO_DECODER
(ffmpegdec), nsamples * byte_per_sample * channels);
(ffmpegdec), output_size);
gst_buffer_map (*outbuf, &minfo, GST_MAP_WRITE);
@ -520,8 +524,8 @@ gst_ffmpegauddec_audio_frame (GstFFMpegAudDec * ffmpegdec,
} else {
*outbuf =
gst_audio_decoder_allocate_output_buffer (GST_AUDIO_DECODER
(ffmpegdec), frame.linesize[0]);
gst_buffer_fill (*outbuf, 0, frame.data[0], frame.linesize[0]);
(ffmpegdec), output_size);
gst_buffer_fill (*outbuf, 0, frame.data[0], output_size);
}
GST_DEBUG_OBJECT (ffmpegdec, "Buffer created. Size: %d", have_data);