diff options
author | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-06-08 12:11:12 +0400 |
---|---|---|
committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-06-08 12:11:12 +0400 |
commit | f65495d405a81cfd7aa0d402fdd205f26f2cdd0f (patch) | |
tree | 40db0f07599269d739b575ff27711953631a8bc5 | |
parent | e44df74eda531b5ae399f8875891deb0f8413241 (diff) |
update for audio api change
-rw-r--r-- | ext/flac/gstflacenc.c | 2 | ||||
-rw-r--r-- | ext/wavpack/gstwavpackenc.c | 2 | ||||
-rw-r--r-- | gst/audioparsers/gstwavpackparse.c | 2 | ||||
-rw-r--r-- | sys/oss4/oss4-audio.c | 3 | ||||
-rw-r--r-- | tests/check/elements/interleave.c | 6 |
5 files changed, 8 insertions, 7 deletions
diff --git a/ext/flac/gstflacenc.c b/ext/flac/gstflacenc.c index 069f48dde..b7915e08d 100644 --- a/ext/flac/gstflacenc.c +++ b/ext/flac/gstflacenc.c @@ -649,7 +649,7 @@ gst_flac_enc_getcaps (GstAudioEncoder * enc, GstCaps * filter) guint64 channel_mask; gst_audio_channel_positions_to_mask (channel_positions[i - 1], i, - &channel_mask); + FALSE, &channel_mask); gst_structure_set (s2, "channels", G_TYPE_INT, i, "channel-mask", GST_TYPE_BITMASK, channel_mask, NULL); } diff --git a/ext/wavpack/gstwavpackenc.c b/ext/wavpack/gstwavpackenc.c index 575325435..6115e8dbb 100644 --- a/ext/wavpack/gstwavpackenc.c +++ b/ext/wavpack/gstwavpackenc.c @@ -400,7 +400,7 @@ gst_wavpack_enc_set_format (GstAudioEncoder * benc, GstAudioInfo * info) enc->channel_mapping); /* wavpack caps hold gst mask, not wavpack mask */ - gst_audio_channel_positions_to_mask (opos, enc->channels, &mask); + gst_audio_channel_positions_to_mask (opos, enc->channels, FALSE, &mask); /* set fixed src pad caps now that we know what we will get */ caps = gst_caps_new_simple ("audio/x-wavpack", diff --git a/gst/audioparsers/gstwavpackparse.c b/gst/audioparsers/gstwavpackparse.c index e11f82afa..a4e49a50a 100644 --- a/gst/audioparsers/gstwavpackparse.c +++ b/gst/audioparsers/gstwavpackparse.c @@ -565,7 +565,7 @@ gst_wavpack_parse_handle_frame (GstBaseParse * parse, if (!gst_wavpack_get_channel_positions (chans, mask, pos)) { GST_WARNING_OBJECT (wvparse, "Failed to determine channel layout"); } else { - gst_audio_channel_positions_to_mask (pos, chans, &gmask); + gst_audio_channel_positions_to_mask (pos, chans, FALSE, &gmask); if (gmask) gst_caps_set_simple (caps, "channel-mask", GST_TYPE_BITMASK, gmask, NULL); diff --git a/sys/oss4/oss4-audio.c b/sys/oss4/oss4-audio.c index 11f6e5e71..89ab3d40b 100644 --- a/sys/oss4/oss4-audio.c +++ b/sys/oss4/oss4-audio.c @@ -309,7 +309,8 @@ gst_oss4_audio_add_channel_layout (GstObject * obj, guint64 layout, g_return_if_fail (num_channels <= G_N_ELEMENTS (ch_layout)); gst_oss4_audio_get_channel_layout (obj, layout, num_channels, ch_layout); - if (gst_audio_channel_positions_to_mask (ch_layout, num_channels, &mask)) + if (gst_audio_channel_positions_to_mask (ch_layout, num_channels, FALSE, + &mask)) gst_structure_set (s, "channel-mask", GST_TYPE_BITMASK, mask, NULL); return; diff --git a/tests/check/elements/interleave.c b/tests/check/elements/interleave.c index 5f30097c4..1c8c71fe7 100644 --- a/tests/check/elements/interleave.c +++ b/tests/check/elements/interleave.c @@ -456,17 +456,17 @@ sink_handoff_float32 (GstElement * element, GstBuffer * buffer, GstPad * pad, if (n == 0) { GstAudioChannelPosition pos[2] = { GST_AUDIO_CHANNEL_POSITION_NONE, GST_AUDIO_CHANNEL_POSITION_NONE }; - gst_audio_channel_positions_to_mask (pos, 2, &mask); + gst_audio_channel_positions_to_mask (pos, 2, FALSE, &mask); } else if (n == 1) { GstAudioChannelPosition pos[2] = { GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT, GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT }; - gst_audio_channel_positions_to_mask (pos, 2, &mask); + gst_audio_channel_positions_to_mask (pos, 2, FALSE, &mask); } else if (n == 2) { GstAudioChannelPosition pos[2] = { GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER, GST_AUDIO_CHANNEL_POSITION_REAR_CENTER }; - gst_audio_channel_positions_to_mask (pos, 2, &mask); + gst_audio_channel_positions_to_mask (pos, 2, FALSE, &mask); } caps = gst_caps_new_simple ("audio/x-raw", |