Merge pull request #710 in FS/freeswitch from…

Merge pull request #710 in FS/freeswitch from feature/FS-8688-implement-vp9-draft-uberti-payload to master

* commit '5b456b39':
  FS-8688 #resolve [Implement VP9 draft uberti payload 01 and libVPX 1.5]

configure.ac

@@ -1274,11 +1274,27 @@ PKG_CHECK_MODULES([SNDFILE], [sndfile >= 1.0.20],[
   AM_CONDITIONAL([HAVE_SNDFILE],[true])],[
   AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_SNDFILE],[false])])
 
-PKG_CHECK_MODULES([VPX], [vpx2 >= 1.4.0],[
-  AM_CONDITIONAL([HAVE_VPX],[true])],[
-    PKG_CHECK_MODULES([VPX], [vpx >= 1.4.0],[
-      AM_CONDITIONAL([HAVE_VPX],[true])],[
-      AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_VPX],[false])])])
+ac_cv_have_vpx=no
+PKG_CHECK_MODULES([VPX], [vpx2 >= 1.5.0],[
+  ac_cv_have_vpx=yes],[
+    PKG_CHECK_MODULES([VPX], [vpx >= 1.5.0],[
+      ac_cv_have_vpx=yes],[
+      AC_MSG_RESULT([no]); ac_cv_have_vpx=no])])
+
+vpx_atleast_15=no
+
+if test x"$ac_cv_have_vpx" = xyes; then
+AC_MSG_CHECKING(whether libvpx is at least version 1.5)
+save_CPPFLAGS="${CPPFLAGS}"
+CPPFLAGS="${VPX_CFLAGS} ${save_CPPFLAGS}"
+AC_TRY_COMPILE([
+#include <vpx/vpx_image.h>
+], [vpx_color_range_t foo = VPX_CR_FULL_RANGE;],[vpx_atleast_15=yes],[vpx_atleast_15=no])
+AC_MSG_RESULT($vpx_atleast_15)
+CPPFLAGS="${save_CPPFLAGS}"
+fi
+
+AM_CONDITIONAL([HAVE_VPX],[test "x$vpx_atleast_15" != "xno"])
 
 SWITCH_AM_CFLAGS="$VPX_CFLAGS $SWITCH_AM_CFLAGS"
 SWITCH_AM_CXXFLAGS="$VPX_CFLAGS $SWITCH_AM_CXXFLAGS"

src/include/switch_image.h

@@ -78,10 +78,17 @@ extern "C" {
     VPX_CS_SRGB       = 7   /**< sRGB */
   } vpx_color_space_t; /**< alias for enum vpx_color_space */
 
+  /*!\brief List of supported color range */
+  typedef enum vpx_color_range {
+    VPX_CR_STUDIO_RANGE = 0,    /**< Y [16..235], UV [16..240] */
+    VPX_CR_FULL_RANGE   = 1     /**< YUV/RGB [0..255] */
+  } vpx_color_range_t; /**< alias for enum vpx_color_range */
+
   /**\brief Image Descriptor */
   typedef struct vpx_image {
     vpx_img_fmt_t fmt; /**< Image Format */
     vpx_color_space_t cs; /**< Color Space */
+    vpx_color_range_t range; /**< Color Range */
 
     /* Image storage dimensions */
     unsigned int  w;           /**< Stored image width */
@@ -92,6 +99,10 @@ extern "C" {
     unsigned int  d_w;   /**< Displayed image width */
     unsigned int  d_h;   /**< Displayed image height */
 
+    /* Image intended rendering dimensions */
+    unsigned int  r_w;   /**< Intended rendering image width */
+    unsigned int  r_h;   /**< Intended rendering image height */
+
     /* Chroma subsampling info */
     unsigned int  x_chroma_shift;   /**< subsampling order, X */
     unsigned int  y_chroma_shift;   /**< subsampling order, Y */