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

gst/audioconvert/gstchannelmix.c: Fix copy & paste error in last commit.

Browse source 
Original commit message from CVS:
* gst/audioconvert/gstchannelmix.c: (gst_channel_mix_fill_others):
Fix copy & paste error in last commit.
This commit is contained in:
Sebastian Dröge 2008-05-21 11:36:37 +00:00
parent 7d605d4514
commit 736b181916
2 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2008-05-21 Sebastian Dröge <slomo@circular-chaos.org>
* gst/audioconvert/gstchannelmix.c: (gst_channel_mix_fill_others):
Fix copy & paste error in last commit.
2008-05-21 Sebastian Dröge <slomo@circular-chaos.org> 2008-05-21 Sebastian Dröge <slomo@circular-chaos.org>
* gst/audioconvert/gstchannelmix.c: (gst_channel_mix_fill_others): * gst/audioconvert/gstchannelmix.c: (gst_channel_mix_fill_others):

24
gst/audioconvert/gstchannelmix.c
View file

@ -398,7 +398,7 @@ gst_channel_mix_fill_others (AudioConvertCtx * this)
GST_AUDIO_CHANNEL_POSITION_INVALID, GST_AUDIO_CHANNEL_POSITION_INVALID,
GST_AUDIO_CHANNEL_POSITION_INVALID, GST_AUDIO_CHANNEL_POSITION_INVALID,
GST_AUDIO_CHANNEL_POSITION_LFE, GST_AUDIO_CHANNEL_POSITION_LFE,
&this->out, out_r, &this->out, out_s,
GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT, GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT,
GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT, GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT,
GST_AUDIO_CHANNEL_POSITION_INVALID, RATIO_SIDE_BASS); GST_AUDIO_CHANNEL_POSITION_INVALID, RATIO_SIDE_BASS);
@ -439,7 +439,7 @@ gst_channel_mix_fill_others (AudioConvertCtx * this)
} }
if (in_has_side) { if (in_has_side) {
gst_channel_mix_fill_one_other (this->matrix, gst_channel_mix_fill_one_other (this->matrix,
&this->in, in_r, &this->in, in_s,
GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT, GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT,
GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT, GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT,
GST_AUDIO_CHANNEL_POSITION_INVALID, GST_AUDIO_CHANNEL_POSITION_INVALID,
@ -457,13 +457,13 @@ gst_channel_mix_fill_others (AudioConvertCtx * this)
GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT, GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT, GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT,
GST_AUDIO_CHANNEL_POSITION_FRONT_MONO, GST_AUDIO_CHANNEL_POSITION_FRONT_MONO,
&this->out, out_r, &this->out, out_s,
GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT, GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT,
GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT, GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT,
GST_AUDIO_CHANNEL_POSITION_INVALID, RATIO_FRONT_SIDE); GST_AUDIO_CHANNEL_POSITION_INVALID, RATIO_FRONT_SIDE);
} else if (in_has_side && !out_has_side && out_has_front) { } else if (in_has_side && !out_has_side && out_has_front) {
gst_channel_mix_fill_one_other (this->matrix, gst_channel_mix_fill_one_other (this->matrix,
&this->in, in_r, &this->in, in_s,
GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT, GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT,
GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT, GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT,
GST_AUDIO_CHANNEL_POSITION_INVALID, GST_AUDIO_CHANNEL_POSITION_INVALID,
@ -476,21 +476,21 @@ gst_channel_mix_fill_others (AudioConvertCtx * this)
/* rear/side */ /* rear/side */
if (!in_has_side && in_has_rear && out_has_side) { if (!in_has_side && in_has_rear && out_has_side) {
gst_channel_mix_fill_one_other (this->matrix, gst_channel_mix_fill_one_other (this->matrix,
&this->in, in_f, &this->in, in_r,
GST_AUDIO_CHANNEL_POSITION_REAR_LEFT, GST_AUDIO_CHANNEL_POSITION_REAR_LEFT,
GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT, GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT,
GST_AUDIO_CHANNEL_POSITION_REAR_CENTER, GST_AUDIO_CHANNEL_POSITION_REAR_CENTER,
&this->out, out_r, &this->out, out_s,
GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT, GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT,
GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT, GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT,
GST_AUDIO_CHANNEL_POSITION_INVALID, RATIO_REAR_SIDE); GST_AUDIO_CHANNEL_POSITION_INVALID, RATIO_REAR_SIDE);
} else if (in_has_side && !out_has_side && out_has_rear) { } else if (in_has_side && !out_has_side && out_has_rear) {
gst_channel_mix_fill_one_other (this->matrix, gst_channel_mix_fill_one_other (this->matrix,
&this->in, in_r, &this->in, in_s,
GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT, GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT,
GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT, GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT,
GST_AUDIO_CHANNEL_POSITION_INVALID, GST_AUDIO_CHANNEL_POSITION_INVALID,
&this->out, out_f, &this->out, out_r,
GST_AUDIO_CHANNEL_POSITION_REAR_LEFT, GST_AUDIO_CHANNEL_POSITION_REAR_LEFT,
GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT, GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT,
GST_AUDIO_CHANNEL_POSITION_REAR_CENTER, RATIO_REAR_SIDE); GST_AUDIO_CHANNEL_POSITION_REAR_CENTER, RATIO_REAR_SIDE);
@ -500,21 +500,21 @@ gst_channel_mix_fill_others (AudioConvertCtx * this)
/* FIXME: should center<->side have influence on eachother? */ /* FIXME: should center<->side have influence on eachother? */
if (!in_has_side && in_has_center && out_has_side) { if (!in_has_side && in_has_center && out_has_side) {
gst_channel_mix_fill_one_other (this->matrix, gst_channel_mix_fill_one_other (this->matrix,
&this->in, in_f, &this->in, in_c,
GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER, GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER,
GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER, GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER,
GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER, GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER,
&this->out, out_r, &this->out, out_s,
GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT, GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT,
GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT, GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT,
GST_AUDIO_CHANNEL_POSITION_INVALID, RATIO_CENTER_SIDE); GST_AUDIO_CHANNEL_POSITION_INVALID, RATIO_CENTER_SIDE);
} else if (in_has_side && !out_has_side && out_has_center) { } else if (in_has_side && !out_has_side && out_has_center) {
gst_channel_mix_fill_one_other (this->matrix, gst_channel_mix_fill_one_other (this->matrix,
&this->in, in_r, &this->in, in_s,
GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT, GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT,
GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT, GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT,
GST_AUDIO_CHANNEL_POSITION_INVALID, GST_AUDIO_CHANNEL_POSITION_INVALID,
&this->out, out_f, &this->out, out_c,
GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER, GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER,
GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER, GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER,
GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER, RATIO_CENTER_SIDE); GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER, RATIO_CENTER_SIDE);