mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 20:21:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

a52dec: really prefer the original number (and position) of channels

Browse source 
Fixes https://bugzilla.gnome.org/show_bug.cgi?id=676495
This commit is contained in:
Julien Isorce 2012-05-21 14:57:44 +02:00 committed by Wim Taymans
parent 6f5af2c579
commit 6f0f28af45
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ext/a52dec/gsta52dec.c
View file

@ -532,7 +532,8 @@ gst_a52dec_handle_frame (GstAudioDecoder * bdec, GstBuffer * buffer)
if (caps && gst_caps_get_size (caps) > 0) { if (caps && gst_caps_get_size (caps) > 0) {
GstCaps *copy = gst_caps_copy_nth (caps, 0); GstCaps *copy = gst_caps_copy_nth (caps, 0);
GstStructure *structure = gst_caps_get_structure (copy, 0); GstStructure *structure = gst_caps_get_structure (copy, 0);
gint channels; gint orig_channels = flags ? gst_a52dec_channels (flags, NULL) : 6;
gint fixed_channels = 0;
const int a52_channels[6] = { const int a52_channels[6] = {
A52_MONO, A52_MONO,
A52_STEREO, A52_STEREO,
@ -546,12 +547,15 @@ gst_a52dec_handle_frame (GstAudioDecoder * bdec, GstBuffer * buffer)
* preferred (first in the caps) downstream if possible. * preferred (first in the caps) downstream if possible.
*/ */
gst_structure_fixate_field_nearest_int (structure, "channels", gst_structure_fixate_field_nearest_int (structure, "channels",
flags ? gst_a52dec_channels (flags, NULL) : 6); orig_channels);
if (gst_structure_get_int (structure, "channels", &channels)
&& channels <= 6) if (gst_structure_get_int (structure, "channels", &fixed_channels)
flags = a52_channels[channels - 1]; && fixed_channels <= 6) {
else if (fixed_channels < orig_channels)
flags = a52_channels[fixed_channels - 1];
} else {
flags = a52_channels[5]; flags = a52_channels[5];
}
gst_caps_unref (copy); gst_caps_unref (copy);
} else if (flags) } else if (flags)