From d6834432eda8170f6d3cea6837ce7ba415d7d63d Mon Sep 17 00:00:00 2001
From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com>
Date: Wed, 30 Dec 2015 13:12:13 +0000
Subject: [PATCH] codecparsers: vp9: fix macro namespacing and rename
 GstVp9InterpFilter

---
 gst-libs/gst/codecparsers/gstvp9parser.c | 16 ++++++++--------
 gst-libs/gst/codecparsers/gstvp9parser.h | 26 +++++++++++++-------------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/gst-libs/gst/codecparsers/gstvp9parser.c b/gst-libs/gst/codecparsers/gstvp9parser.c
index 68d5571..a324a86 100644
--- a/gst-libs/gst/codecparsers/gstvp9parser.c
+++ b/gst-libs/gst/codecparsers/gstvp9parser.c
@@ -206,17 +206,17 @@ parse_frame_size_from_refs (const GstVp9Parser * parser,
     parse_frame_size (br, &frame_hdr->width, &frame_hdr->height);
 }
 
-static GstVp9InterpFilter
+static GstVp9InterpolationFilter
 parse_interp_filter (GstBitReader * br)
 {
-  const GstVp9InterpFilter filter_map[] = {
-    GST_VP9_INTERP_FILTER_EIGHTTAP_SMOOTH,
-    GST_VP9_INTERP_FILTER_EIGHTTAP,
-    GST_VP9_INTERP_FILTER_EIGHTTAP_SHARP,
-    GST_VP9_INTERP_FILTER_BILINEAR
+  static const GstVp9InterpolationFilter filter_map[] = {
+    GST_VP9_INTERPOLATION_FILTER_EIGHTTAP_SMOOTH,
+    GST_VP9_INTERPOLATION_FILTER_EIGHTTAP,
+    GST_VP9_INTERPOLATION_FILTER_EIGHTTAP_SHARP,
+    GST_VP9_INTERPOLATION_FILTER_BILINEAR
   };
 
-  return gst_vp9_read_bit (br) ? GST_VP9_INTERP_FILTER_SWITCHABLE :
+  return gst_vp9_read_bit (br) ? GST_VP9_INTERPOLATION_FILTER_SWITCHABLE :
       filter_map[gst_vp9_read_bits (br, 2)];
 }
 
@@ -781,7 +781,7 @@ gst_vp9_parser_parse_frame_header (GstVp9Parser * parser,
   frame_hdr->frame_parallel_decoding_mode =
       frame_hdr->error_resilient_mode ? 1 : gst_vp9_read_bit (br);
   frame_hdr->frame_context_idx =
-      gst_vp9_read_bits (br, GST_FRAME_CONTEXTS_LOG2);
+      gst_vp9_read_bits (br, GST_VP9_FRAME_CONTEXTS_LOG2);
 
   /* loopfilter header  */
   parse_loopfilter (&frame_hdr->loopfilter, br);
diff --git a/gst-libs/gst/codecparsers/gstvp9parser.h b/gst-libs/gst/codecparsers/gstvp9parser.h
index 8c3d07b..fd45e54 100644
--- a/gst-libs/gst/codecparsers/gstvp9parser.h
+++ b/gst-libs/gst/codecparsers/gstvp9parser.h
@@ -44,7 +44,7 @@ G_BEGIN_DECLS
 #define GST_VP9_REF_FRAMES_LOG2    3
 #define GST_VP9_REF_FRAMES         (1 << GST_VP9_REF_FRAMES_LOG2)
 
-#define GST_FRAME_CONTEXTS_LOG2    2
+#define GST_VP9_FRAME_CONTEXTS_LOG2 2
 
 #define GST_VP9_MAX_LOOP_FILTER    63
 #define GST_VP9_MAX_SHARPNESS      7
@@ -176,24 +176,24 @@ typedef enum {
 } GstVp9ColorRange;
 
 /**
- * GstVp9InterpFilter:
- * @GST_VP9_INTERP_FILTER_EIGHTTAP: EightTap interpolation filter
- * @GST_VP9_INTERP_FILTER_EIGHTTAP_SMOOTH: Smooth interpolation filter
- * @GST_VP9_INTERP_FILTER_EIGHTTAP_SHARP: Shart interpolation filter
- * @GST_VP9_INTERP_FILTER_BILINEAR: Bilinear interpolation filter
- * @GST_VP9_INTERP_FILTER_SWITCHABLE: Selectable interpolation filter
+ * GstVp9InterpolationFilter:
+ * @GST_VP9_INTERPOLATION_FILTER_EIGHTTAP: EightTap interpolation filter
+ * @GST_VP9_INTERPOLATION_FILTER_EIGHTTAP_SMOOTH: Smooth interpolation filter
+ * @GST_VP9_INTERPOLATION_FILTER_EIGHTTAP_SHARP: Shart interpolation filter
+ * @GST_VP9_INTERPOLATION_FILTER_BILINEAR: Bilinear interpolation filter
+ * @GST_VP9_INTERPOLATION_FILTER_SWITCHABLE: Selectable interpolation filter
  *
  * Interpolation Filters Types
  *
  * Since: 1.8
  */
 typedef enum {
-  GST_VP9_INTERP_FILTER_EIGHTTAP        = 0,
-  GST_VP9_INTERP_FILTER_EIGHTTAP_SMOOTH = 1,
-  GST_VP9_INTERP_FILTER_EIGHTTAP_SHARP  = 2,
-  GST_VP9_INTERP_FILTER_BILINEAR        = 3,
-  GST_VP9_INTERP_FILTER_SWITCHABLE      = 4
-} GstVp9InterpFilter;
+  GST_VP9_INTERPOLATION_FILTER_EIGHTTAP        = 0,
+  GST_VP9_INTERPOLATION_FILTER_EIGHTTAP_SMOOTH = 1,
+  GST_VP9_INTERPOLATION_FILTER_EIGHTTAP_SHARP  = 2,
+  GST_VP9_INTERPOLATION_FILTER_BILINEAR        = 3,
+  GST_VP9_INTERPOLATION_FILTER_SWITCHABLE      = 4
+} GstVp9InterpolationFilter;
 
 /**
  * GstVp9RefFrameType:
-- 
2.7.4