From: Brad Hards <bradh@frogmouth.net>
Date: Sun, 7 Nov 2021 00:18:15 +0000 (+1100)
Subject: h264parser: typo fix in enum value
X-Git-Tag: 1.22.0~172
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=29dd254f7a343fd31aeece2ea16c43c4960d41a1;p=platform%2Fupstream%2Fgstreamer.git

h264parser: typo fix in enum value

Old value is marked deprecated, new enum with same entry is added. Should be binary compatible.

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

diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/codecparsers/gsth264parser.h b/subprojects/gst-plugins-bad/gst-libs/gst/codecparsers/gsth264parser.h
index 05273f2..2a051ce 100644
--- a/subprojects/gst-plugins-bad/gst-libs/gst/codecparsers/gsth264parser.h
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/codecparsers/gsth264parser.h
@@ -218,7 +218,8 @@ typedef enum
  * @GST_H264_FRAME_PACKING_COLUMN_INTERLEAVING: Column based interleaving
  * @GST_H264_FRAME_PACKING_ROW_INTERLEAVING: Row based interleaving
  * @GST_H264_FRAME_PACKING_SIDE_BY_SIDE: Side-by-side packing
- * @GST_H264_FRMAE_PACKING_TOP_BOTTOM: Top-Bottom packing
+ * @GST_H264_FRMAE_PACKING_TOP_BOTTOM: Deprecated; use GST_H264_FRAME_PACKING_TOP_BOTTOM instead
+ * @GST_H264_FRAME_PACKING_TOP_BOTTOM: Top-Bottom packing (Since: 1.22)
  * @GST_H264_FRAME_PACKING_TEMPORAL_INTERLEAVING: Temporal interleaving
  *
  * Frame packing arrangement types.
@@ -233,6 +234,7 @@ typedef enum
   GST_H264_FRAME_PACKING_ROW_INTERLEAVING               = 2,
   GST_H264_FRAME_PACKING_SIDE_BY_SIDE                   = 3,
   GST_H264_FRMAE_PACKING_TOP_BOTTOM                     = 4,
+  GST_H264_FRAME_PACKING_TOP_BOTTOM                     = 4,
   GST_H264_FRAME_PACKING_TEMPORAL_INTERLEAVING          = 5
 } GstH264FramePackingType;
 
diff --git a/subprojects/gst-plugins-bad/sys/msdk/gstmsdkh264enc.c b/subprojects/gst-plugins-bad/sys/msdk/gstmsdkh264enc.c
index 4dd30e6..effcb39 100644
--- a/subprojects/gst-plugins-bad/sys/msdk/gstmsdkh264enc.c
+++ b/subprojects/gst-plugins-bad/sys/msdk/gstmsdkh264enc.c
@@ -348,7 +348,7 @@ gst_msdkh264enc_set_format (GstMsdkEnc * encoder)
       frame_packing->frame_packing_type =
           (mode == GST_VIDEO_MULTIVIEW_MODE_SIDE_BY_SIDE ?
           GST_H264_FRAME_PACKING_SIDE_BY_SIDE :
-          GST_H264_FRMAE_PACKING_TOP_BOTTOM);
+          GST_H264_FRAME_PACKING_TOP_BOTTOM);
       /* we don't do this */
       frame_packing->quincunx_sampling_flag = 0;
       /* 0: unspecified */
diff --git a/subprojects/gstreamer-vaapi/gst-libs/gst/vaapi/gstvaapidecoder_h264.c b/subprojects/gstreamer-vaapi/gst-libs/gst/vaapi/gstvaapidecoder_h264.c
index 490528c..e19c184 100644
--- a/subprojects/gstreamer-vaapi/gst-libs/gst/vaapi/gstvaapidecoder_h264.c
+++ b/subprojects/gstreamer-vaapi/gst-libs/gst/vaapi/gstvaapidecoder_h264.c
@@ -2053,7 +2053,7 @@ decode_sei_frame_packing (GstVaapiDecoderH264 * decoder,
         priv->stereo_info.mode = GST_VIDEO_MULTIVIEW_MODE_SIDE_BY_SIDE;
       }
       break;
-    case GST_H264_FRMAE_PACKING_TOP_BOTTOM:
+    case GST_H264_FRAME_PACKING_TOP_BOTTOM:
       priv->stereo_info.mode = GST_VIDEO_MULTIVIEW_MODE_TOP_BOTTOM;
       break;
     case GST_H264_FRAME_PACKING_TEMPORAL_INTERLEAVING:
@@ -2097,7 +2097,7 @@ decode_sei_frame_packing (GstVaapiDecoderH264 * decoder,
       priv->stereo_info.flags |= GST_VIDEO_MULTIVIEW_FLAGS_RIGHT_FLOPPED;
     }
   }
-  if (frame_packing->frame_packing_type == GST_H264_FRMAE_PACKING_TOP_BOTTOM
+  if (frame_packing->frame_packing_type == GST_H264_FRAME_PACKING_TOP_BOTTOM
       && frame_packing->spatial_flipping_flag !=
       ((priv->stereo_info.flags &
               GST_VIDEO_MULTIVIEW_FLAGS_RIGHT_VIEW_FIRST) != 0)) {