mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-29 13:11:06 +00:00
qtdemux: attach cbcs crypt info at the right moment
Before it was always added but that can cause issues when the stream begins unencrypted. Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5085>
This commit is contained in:
parent
dc494d9edb
commit
5114fb4170
1 changed files with 15 additions and 6 deletions
|
@ -6530,13 +6530,22 @@ gst_qtdemux_push_buffer (GstQTDemux * qtdemux, QtDemuxStream * stream,
|
|||
|
||||
if (info->crypto_info == NULL) {
|
||||
if (stream->protection_scheme_type == FOURCC_cbcs) {
|
||||
crypto_info = qtdemux_get_cenc_sample_properties (qtdemux, stream, 0);
|
||||
if (!crypto_info || !gst_buffer_add_protection_meta (buf, crypto_info)) {
|
||||
GST_ERROR_OBJECT (qtdemux,
|
||||
"failed to attach cbcs metadata to buffer");
|
||||
qtdemux_gst_structure_free (crypto_info);
|
||||
if (CUR_STREAM (stream)->fourcc == FOURCC_enca ||
|
||||
CUR_STREAM (stream)->fourcc == FOURCC_encs ||
|
||||
CUR_STREAM (stream)->fourcc == FOURCC_enct ||
|
||||
CUR_STREAM (stream)->fourcc == FOURCC_encv) {
|
||||
crypto_info = qtdemux_get_cenc_sample_properties (qtdemux, stream, 0);
|
||||
if (!crypto_info
|
||||
|| !gst_buffer_add_protection_meta (buf, crypto_info)) {
|
||||
GST_ERROR_OBJECT (qtdemux,
|
||||
"failed to attach cbcs metadata to buffer");
|
||||
qtdemux_gst_structure_free (crypto_info);
|
||||
} else {
|
||||
GST_TRACE_OBJECT (qtdemux, "added cbcs protection metadata");
|
||||
}
|
||||
} else {
|
||||
GST_TRACE_OBJECT (qtdemux, "added cbcs protection metadata");
|
||||
GST_TRACE_OBJECT (qtdemux,
|
||||
"cbcs stream is not encrypted yet, not adding protection metadata");
|
||||
}
|
||||
} else {
|
||||
GST_DEBUG_OBJECT (qtdemux,
|
||||
|
|
Loading…
Reference in a new issue