drm+v4l2 updates:

-remove reference to unneeded header file -add compilation guards for references to newer V4L2 formats Change-Id: Id89d05d7f014536185dd39535741fdb15f2fe51f Signed-off-by: jwanna001 <jeff_wannamaker@cable.comcast.com>
rdkcmf · May 27, 2020 · 2a284af · 2a284af
1 parent 2e372a9
commit 2a284af
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/drm/westeros-gl/westeros-gl.h b/drm/westeros-gl/westeros-gl.h
@@ -18,7 +18,7 @@
  */
 #ifndef _WESTEROS_GL_H
 #define _WESTEROS_GL_H
-#include "config.h"
+//#include "config.h"
 
 #ifndef __cplusplus
 #include <stdbool.h>

diff --git a/v4l2/westeros-sink/westeros-sink-soc.c b/v4l2/westeros-sink/westeros-sink-soc.c
@@ -634,16 +634,20 @@ gboolean gst_westeros_sink_soc_accept_caps( GstWesterosSink *sink, GstCaps *caps
             }
             result= TRUE;
          }
+         #ifdef V4L2_PIX_FMT_HEVC
          else if ( (len == 12) && !strncmp("video/x-h265", mime, len) )
          {
             sink->soc.inputFormat= V4L2_PIX_FMT_HEVC;
             result= TRUE;
          }
+         #endif
+         #ifdef V4L2_PIX_FMT_VP9
          else if ( (len == 11) && !strncmp("video/x-vp9", mime, len) )
          {
             sink->soc.inputFormat= V4L2_PIX_FMT_VP9;
             result= TRUE;
          }
+         #endif
          else
          {
             GST_ERROR("gst_westeros_sink_soc_accept_caps: not accepting caps (%s)", mime );
@@ -1170,13 +1174,16 @@ static void wstBuildSinkCaps( GstWesterosSinkClass *klass, GstWesterosSink *dumm
                                                 "width=(int) [1,MAX], " "height=(int) [1,MAX] ; " \
                                              );
                break;
+            #ifdef V4L2_PIX_FMT_VP9
             case V4L2_PIX_FMT_VP9:
                capsTemp= gst_caps_from_string(
                                                 "video/x-vp9, " \
                                                 "width=(int) [1,MAX], " \
                                                 "height=(int) [1,MAX] ; "
                                              );
                break;
+            #endif
+            #ifdef V4L2_PIX_FMT_HEVC
             case V4L2_PIX_FMT_HEVC:
                capsTemp= gst_caps_from_string(
                                                 "video/x-h265, " \
@@ -1187,6 +1194,7 @@ static void wstBuildSinkCaps( GstWesterosSinkClass *klass, GstWesterosSink *dumm
                                                 "height=(int) [1,MAX] ; "
                                              );
                break;
+            #endif
             default:
                break;
          }