From: Sebastian Wick <sebastian.wick@redhat.com>
Date: Thu, 17 Feb 2022 16:36:22 +0000 (+0100)
Subject: matroska: default prores fourcc apcn
X-Git-Tag: 1.22.0~2409
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e61e0691890ebacb88e5e636de18522be9bbb8f6;p=platform%2Fupstream%2Fgstreamer.git

matroska: default prores fourcc apcn

If there is no codec private data for prores it should default to Apple
ProRes 422 Standard Definition (apcn). Can be tested with
strobe_scientist.mkv from
https://developers.google.com/media/vp9/hdr-encoding

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1734>
---

diff --git a/subprojects/gst-plugins-good/gst/matroska/matroska-demux.c b/subprojects/gst-plugins-good/gst/matroska/matroska-demux.c
index 52a76b9..4da7e15 100644
--- a/subprojects/gst-plugins-good/gst/matroska/matroska-demux.c
+++ b/subprojects/gst-plugins-good/gst/matroska/matroska-demux.c
@@ -6643,16 +6643,16 @@ gst_matroska_demux_video_caps (GstMatroskaTrackVideoContext *
     }
     *codec_name = g_strdup_printf ("FFMpeg v1");
   } else if (!strcmp (codec_id, GST_MATROSKA_CODEC_ID_VIDEO_PRORES)) {
-    guint32 fourcc;
+    guint32 fourcc = 0;
     const gchar *variant, *variant_descr = "";
 
     /* Expect a fourcc in the codec private data */
-    if (!data || size < 4) {
-      GST_WARNING ("No or too small PRORESS fourcc (%d bytes)", size);
-      return NULL;
+    if (data && size >= 4) {
+      fourcc = GST_STR_FOURCC (data);
+    } else {
+      GST_DEBUG ("Picking apcn variant because no ProRes codec data found");
     }
 
-    fourcc = GST_STR_FOURCC (data);
     switch (fourcc) {
       case GST_MAKE_FOURCC ('a', 'p', 'c', 's'):
         variant_descr = " 4:2:2 LT";