Changeset 5624

Timestamp:

Jul 7, 2017 8:40:04 AM (7 years ago)

Author:

nanang

Message:

Misc (re #1994): Rearrange H264 default backend priority to avoid multiple H264 backends. Currently OpenH264 has higher priority than FFmpeg, and VideoToolBox? (for MacOS/iOS) should be manually enabled.

Location:

pjproject/trunk

Files:

• aconfigure (modified) (1 diff)
• aconfigure.ac (modified) (1 diff)
• pjmedia/include/pjmedia-codec/config.h (modified) (1 diff)

pjproject/trunk/aconfigure

@@ -6517 +6517 @@
         fi
         if test "$ac_pjmedia_video_has_vtoolbox" = "yes"; then
-          ac_darwin_cflags+=" -DPJMEDIA_HAS_VID_TOOLBOX_CODEC=1"
+          #ac_darwin_cflags+=" -DPJMEDIA_HAS_VID_TOOLBOX_CODEC=1"
           LIBS="$LIBS -framework VideoToolbox"
           { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if VideoToolbox framework is available... yes" >&5

pjproject/trunk/aconfigure.ac

@@ -838 +838 @@
         fi
         if test "$ac_pjmedia_video_has_vtoolbox" = "yes"; then
-          ac_darwin_cflags+=" -DPJMEDIA_HAS_VID_TOOLBOX_CODEC=1"
+          #ac_darwin_cflags+=" -DPJMEDIA_HAS_VID_TOOLBOX_CODEC=1"
           LIBS="$LIBS -framework VideoToolbox"
           AC_MSG_RESULT([Checking if VideoToolbox framework is available... yes])

pjproject/trunk/pjmedia/include/pjmedia-codec/config.h

@@ -501 +501 @@
  * Enable FFMPEG H264 codec (requires libx264).
  *
- * Default: 0
+ * Default: disabled when OpenH264 is used, otherwise it is set to
+ * PJMEDIA_HAS_FFMPEG_VID_CODEC
  */
 #ifndef PJMEDIA_HAS_FFMPEG_CODEC_H264
-#   define PJMEDIA_HAS_FFMPEG_CODEC_H264        PJMEDIA_HAS_FFMPEG_VID_CODEC
+#   if defined(PJMEDIA_HAS_OPENH264_CODEC) && PJMEDIA_HAS_OPENH264_CODEC != 0
+#       define PJMEDIA_HAS_FFMPEG_CODEC_H264    0
+#   else
+#       define PJMEDIA_HAS_FFMPEG_CODEC_H264    PJMEDIA_HAS_FFMPEG_VID_CODEC
+#   endif
 #endif