patches/videoparsers: h264parser: fix description and refresh

Fix a typo in the patch description and refresh it in order to avoid the
creation of .orig files and break the distcheck target.

Signed-off-by: Víctor Manuel Jáquez Leal <victorx.jaquez@intel.com>
https://bugzilla.gnome.org/show_bug.cgi?id=754845

diff --git a/patches/videoparsers/0004-h264parse-Disable-3D-video-support-for-GStremaer-1.5.patch b/patches/videoparsers/0004-h264parse-Disable-3D-video-support-for-GStreamer-1.5.patch
similarity index 81%
rename from patches/videoparsers/0004-h264parse-Disable-3D-video-support-for-GStremaer-1.5.patch
rename to patches/videoparsers/0004-h264parse-Disable-3D-video-support-for-GStreamer-1.5.patch
index b61a8ca..c1335c6 100644 (file)
--- a/patches/videoparsers/0004-h264parse-Disable-3D-video-support-for-GStremaer-1.5.patch
+++ b/patches/videoparsers/0004-h264parse-Disable-3D-video-support-for-GStreamer-1.5.patch
@@ -1,7 +1,7 @@
-From a711206aeb002e5e523ed6f4a045c2b2b7fb128e Mon Sep 17 00:00:00 2001
+From dbdc05803a63c4d530ea0c2932af2b35df5467b3 Mon Sep 17 00:00:00 2001
 From: Sreerenj Balachandran <sreerenj.balachandran@intel.com>
 Date: Tue, 21 Jul 2015 12:13:18 +0300
-Subject: [PATCH 4/4] h264parse: Disable 3D video support for GStremaer < 1.5
+Subject: [PATCH 4/6] h264parse: Disable 3D video support for GStreamer < 1.5
 
 All API/ABI changes for S3D/MVC are added in 1.5, backporting
 them to older verison is not recommended.
@@ -13,30 +13,30 @@ Signed-off-by: Sreerenj Balachandran <sreerenj.balachandran@intel.com>
  2 files changed, 12 insertions(+), 1 deletion(-)
 
 diff --git a/gst/vaapi/gsth264parse.c b/gst/vaapi/gsth264parse.c
-index 98e9aa6..cd8cf2b 100644
+index f1ed269..7ed6db8 100644
 --- a/gst/vaapi/gsth264parse.c
 +++ b/gst/vaapi/gsth264parse.c
-@@ -215,9 +215,11 @@ gst_h264_parse_reset_stream_info (GstH264Parse * h264parse)
+@@ -218,9 +218,11 @@ gst_h264_parse_reset_stream_info (GstH264Parse * h264parse)
    h264parse->have_pps = FALSE;
    h264parse->have_sps = FALSE;
- 
+
 +#if GST_CHECK_VERSION(1,5,0)
    h264parse->multiview_mode = GST_VIDEO_MULTIVIEW_MODE_NONE;
    h264parse->multiview_flags = GST_VIDEO_MULTIVIEW_FLAGS_NONE;
    h264parse->first_in_bundle = TRUE;
 +#endif
- 
+
    h264parse->align = GST_H264_PARSE_ALIGN_NONE;
    h264parse->format = GST_H264_PARSE_FORMAT_NONE;
-@@ -562,6 +564,7 @@ gst_h264_parse_process_sei (GstH264Parse * h264parse, GstH264NalUnit * nalu)
+@@ -571,6 +573,7 @@ gst_h264_parse_process_sei (GstH264Parse * h264parse, GstH264NalUnit * nalu)
          /* Additional messages that are not innerly useful to the
           * element but for debugging purposes */
        case GST_H264_SEI_STEREO_VIDEO_INFO:{
 +#if GST_CHECK_VERSION(1,5,0)
          GstVideoMultiviewMode mview_mode = GST_VIDEO_MULTIVIEW_MODE_NONE;
          GstVideoMultiviewFlags mview_flags = GST_VIDEO_MULTIVIEW_FLAGS_NONE;
- 
-@@ -593,9 +596,11 @@ gst_h264_parse_process_sei (GstH264Parse * h264parse, GstH264NalUnit * nalu)
+
+@@ -602,9 +605,11 @@ gst_h264_parse_process_sei (GstH264Parse * h264parse, GstH264NalUnit * nalu)
            /* output caps need to be changed */
            gst_h264_parse_update_src_caps (h264parse, NULL);
          }
@@ -47,8 +47,8 @@ index 98e9aa6..cd8cf2b 100644
 +#if GST_CHECK_VERSION(1,5,0)
          GstVideoMultiviewMode mview_mode = GST_VIDEO_MULTIVIEW_MODE_NONE;
          GstVideoMultiviewFlags mview_flags = GST_VIDEO_MULTIVIEW_FLAGS_NONE;
- 
-@@ -684,6 +689,7 @@ gst_h264_parse_process_sei (GstH264Parse * h264parse, GstH264NalUnit * nalu)
+
+@@ -693,6 +698,7 @@ gst_h264_parse_process_sei (GstH264Parse * h264parse, GstH264NalUnit * nalu)
            /* output caps need to be changed */
            gst_h264_parse_update_src_caps (h264parse, NULL);
          }
@@ -56,27 +56,27 @@ index 98e9aa6..cd8cf2b 100644
          break;
        }
      }
-@@ -1746,9 +1752,11 @@ gst_h264_parse_update_src_caps (GstH264Parse * h264parse, GstCaps * caps)
+@@ -1762,9 +1768,11 @@ gst_h264_parse_update_src_caps (GstH264Parse * h264parse, GstCaps * caps)
        gint width, height;
        GstClockTime latency;
- 
+
 +#if GST_CHECK_VERSION(1,5,0)
        const gchar *caps_mview_mode = NULL;
        GstVideoMultiviewMode mview_mode = h264parse->multiview_mode;
        GstVideoMultiviewFlags mview_flags = h264parse->multiview_flags;
 +#endif
- 
+
        fps_num = h264parse->fps_num;
        fps_den = h264parse->fps_den;
-@@ -1780,6 +1788,7 @@ gst_h264_parse_update_src_caps (GstH264Parse * h264parse, GstCaps * caps)
+@@ -1796,6 +1804,7 @@ gst_h264_parse_update_src_caps (GstH264Parse * h264parse, GstCaps * caps)
          }
        }
- 
+
 +#if GST_CHECK_VERSION(1,5,0)
        /* Pass through or set output stereo/multiview config */
        if (s && gst_structure_has_field (s, "multiview-mode")) {
          caps_mview_mode = gst_structure_get_string (s, "multiview-mode");
-@@ -1798,7 +1807,7 @@ gst_h264_parse_update_src_caps (GstH264Parse * h264parse, GstCaps * caps)
+@@ -1814,7 +1823,7 @@ gst_h264_parse_update_src_caps (GstH264Parse * h264parse, GstCaps * caps)
              GST_TYPE_VIDEO_MULTIVIEW_FLAGSET, mview_flags,
              GST_FLAG_SET_MASK_EXACT, NULL);
        }
@@ -84,15 +84,15 @@ index 98e9aa6..cd8cf2b 100644
 +#endif
        gst_caps_set_simple (caps, "width", G_TYPE_INT, width,
            "height", G_TYPE_INT, height, NULL);
- 
+
 diff --git a/gst/vaapi/gsth264parse.h b/gst/vaapi/gsth264parse.h
-index 58d818c..de9be02 100644
+index 617e616..1b89d31 100644
 --- a/gst/vaapi/gsth264parse.h
 +++ b/gst/vaapi/gsth264parse.h
-@@ -123,10 +123,12 @@ struct _GstH264Parse
+@@ -124,10 +124,12 @@ struct _GstH264Parse
    GstClockTime pending_key_unit_ts;
    GstEvent *force_key_unit_event;
- 
+
 +#if GST_CHECK_VERSION(1,5,0)
    /* Stereo / multiview info */
    GstVideoMultiviewMode multiview_mode;
@@ -100,8 +100,7 @@ index 58d818c..de9be02 100644
    gboolean first_in_bundle;
 +#endif
  };
- 
- struct _GstH264ParseClass
--- 
-2.1.4
 
+ struct _GstH264ParseClass
+--
+2.5.1

diff --git a/patches/videoparsers/series.frag b/patches/videoparsers/series.frag
index 12469b6..f293437 100644 (file)
--- a/patches/videoparsers/series.frag
+++ b/patches/videoparsers/series.frag
@@ -4,6 +4,6 @@ videoparsers_patches_base = \
        0001-plugins-compile-the-built-in-video-parsers-as-vaapip.patch \
        0002-h264parse-fix-build-with-older-GStreamer-1.x-stacks.patch  \
         0003-h264parse-default-to-byte-stream-nalu-format-Annex-B.patch \
-        0004-h264parse-Disable-3D-video-support-for-GStremaer-1.5.patch \
+        0004-h264parse-Disable-3D-video-support-for-GStreamer-1.5.patch \
         0001-h265parse-include-gstvaapiparse.h.patch \
        $(NULL)