FaSTTUBe/GST-Tensordecoder-ov_ep
61
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

qtdemux: Don't configure any channel-mask in fallback case with 1 channel

Browse Source 
For mono we don't set any channel mask. Setting 0 would mean an unpositioned
layout with a single channel.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/8928>
This commit is contained in:
Sebastian Dröge 2025-05-06 15:47:30 +03:00 committed by GStreamer Marge Bot
parent 7f8b27837c
commit fff260f1aa
1 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
subprojects/gst-plugins-good/gst/isomp4/qtdemux.c
View File

@ -13134,15 +13134,17 @@ qtdemux_parse_chnl (GstQTDemux * qtdemux, GstByteReader * br,
error: error:
{ {
// Set a default channel mask on errors
guint64 default_mask =
gst_audio_channel_get_fallback_mask (entry->n_channels);
GST_WARNING_OBJECT (qtdemux, GST_WARNING_OBJECT (qtdemux,
"Configuring default channel mask for %u channels", entry->n_channels); "Configuring default channel mask for %u channels", entry->n_channels);
gst_caps_set_simple (entry->caps, "channel-mask", GST_TYPE_BITMASK, if (entry->n_channels > 1) {
default_mask, NULL); // Set a default channel mask on errors
guint64 default_mask =
gst_audio_channel_get_fallback_mask (entry->n_channels);
gst_caps_set_simple (entry->caps, "channel-mask", GST_TYPE_BITMASK,
default_mask, NULL);
}
} }
} }
@ -14468,15 +14470,17 @@ qtdemux_parse_chan (GstQTDemux * qtdemux, GstByteReader * br,
error: error:
{ {
// Set a default channel mask on errors
guint64 default_mask =
gst_audio_channel_get_fallback_mask (entry->n_channels);
GST_WARNING_OBJECT (qtdemux, GST_WARNING_OBJECT (qtdemux,
"Configuring default channel mask for %u channels", entry->n_channels); "Configuring default channel mask for %u channels", entry->n_channels);
gst_caps_set_simple (entry->caps, "channel-mask", GST_TYPE_BITMASK, if (entry->n_channels > 1) {
default_mask, NULL); // Set a default channel mask on errors
guint64 default_mask =
gst_audio_channel_get_fallback_mask (entry->n_channels);
gst_caps_set_simple (entry->caps, "channel-mask", GST_TYPE_BITMASK,
default_mask, NULL);
}
} }
} }
@ -16902,16 +16906,18 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak, guint32 * mvhd_matrix)
qtdemux_parse_chan (qtdemux, &br, stream, entry); qtdemux_parse_chan (qtdemux, &br, stream, entry);
} }
} else { } else {
// Set a default channel mask if all is unknown
guint64 default_mask =
gst_audio_channel_get_fallback_mask (entry->n_channels);
GST_DEBUG_OBJECT (qtdemux, GST_DEBUG_OBJECT (qtdemux,
"Configuring default channel mask for %u channels", "Configuring default channel mask for %u channels",
entry->n_channels); entry->n_channels);
gst_caps_set_simple (entry->caps, "channel-mask", if (entry->n_channels > 1) {
GST_TYPE_BITMASK, default_mask, NULL); // Set a default channel mask if all is unknown
guint64 default_mask =
gst_audio_channel_get_fallback_mask (entry->n_channels);
gst_caps_set_simple (entry->caps, "channel-mask",
GST_TYPE_BITMASK, default_mask, NULL);
}
} }
break; break;
} }