mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-30 04:00:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

ffmpegdec: Reorder audio channels after clipping the audio buffer

Browse source
This commit is contained in:
Sebastian Dröge 2012-01-10 10:45:42 +01:00
parent 3d6c803917
commit 6931afe0ba
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
ext/ffmpeg/gstffmpegdec.c
View file

@ -2244,17 +2244,6 @@ gst_ffmpegdec_audio_frame (GstFFMpegDec * ffmpegdec,
if (len >= 0 && have_data > 0) { if (len >= 0 && have_data > 0) {
GstAudioFormat fmt; GstAudioFormat fmt;
/* Reorder channels to the GStreamer channel order */
/* Only the width really matters here... and it's stored as depth */
fmt =
gst_audio_format_build_integer (TRUE, G_BYTE_ORDER,
ffmpegdec->format.audio.depth, ffmpegdec->format.audio.depth);
gst_audio_reorder_channels (odata, have_data, fmt,
ffmpegdec->format.audio.channels,
ffmpegdec->format.audio.ffmpeg_layout,
ffmpegdec->format.audio.gst_layout);
/* Buffer size */ /* Buffer size */
gst_buffer_unmap (*outbuf, odata, have_data); gst_buffer_unmap (*outbuf, odata, have_data);
@ -2312,6 +2301,17 @@ gst_ffmpegdec_audio_frame (GstFFMpegDec * ffmpegdec,
out_duration))) out_duration)))
goto clipped; goto clipped;
/* Reorder channels to the GStreamer channel order */
/* Only the width really matters here... and it's stored as depth */
fmt =
gst_audio_format_build_integer (TRUE, G_BYTE_ORDER,
ffmpegdec->format.audio.depth * 8, ffmpegdec->format.audio.depth * 8);
gst_audio_buffer_reorder_channels (*outbuf, fmt,
ffmpegdec->format.audio.channels,
ffmpegdec->format.audio.ffmpeg_layout,
ffmpegdec->format.audio.gst_layout);
} else { } else {
gst_buffer_unmap (*outbuf, odata, 0); gst_buffer_unmap (*outbuf, odata, 0);
gst_buffer_unref (*outbuf); gst_buffer_unref (*outbuf);
@ -3179,7 +3179,7 @@ gst_ffmpegdec_register (GstPlugin * plugin)
case CODEC_ID_EAC3: case CODEC_ID_EAC3:
case CODEC_ID_AC3: case CODEC_ID_AC3:
case CODEC_ID_DTS: case CODEC_ID_DTS:
rank = GST_RANK_NONE; rank = GST_RANK_PRIMARY;
break; break;
default: default:
rank = GST_RANK_MARGINAL; rank = GST_RANK_MARGINAL;