Changeset 5364

Timestamp:

Jun 29, 2016 4:58:16 AM (8 years ago)

Author:

nanang

Message:

Re #1937: Keep libyuv enabled in configure script even when ffmpeg swscale is detected because video orientation feature requires libyuv. However, put ffmpeg swscale priority higher than libyuv in video converter.

Location:

pjproject/trunk

Files:

• aconfigure (modified) (2 diffs)
• aconfigure.ac (modified) (2 diffs)
• pjmedia/src/pjmedia/converter.c (modified) (2 diffs)

pjproject/trunk/aconfigure

@@ -6920 +6920 @@
                                 ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBSWSCALE=1"
                                 av_pkg="$av_pkg libswscale"
-                                                                enable_libyuv="no"
                         fi
                         if $PKG_CONFIG --exists libavutil; then
@@ -7159 +7158 @@
   ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBSWSCALE=1"
                                       ac_ffmpeg_ldflags="$ac_ffmpeg_ldflags -lswscale"
-                                      enable_libyuv="no"
 
 fi

pjproject/trunk/aconfigure.ac

@@ -1066 +1066 @@
                                 ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBSWSCALE=1"
                                 av_pkg="$av_pkg libswscale"
-                                dnl # disable libyuv when libswscale is enabled
-                                enable_libyuv="no"
                         fi
                         if $PKG_CONFIG --exists libavutil; then
@@ -1126 +1124 @@
                                      [ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBSWSCALE=1"
                                       ac_ffmpeg_ldflags="$ac_ffmpeg_ldflags -lswscale"
-                                      enable_libyuv="no"
                                      ],
                                      [],

pjproject/trunk/pjmedia/src/pjmedia/converter.c

@@ -53 +53 @@
         converter_manager_instance = mgr;
 
-#if defined(PJMEDIA_HAS_LIBYUV) && PJMEDIA_HAS_LIBYUV != 0
-    status = pjmedia_libyuv_converter_init(mgr);
-    if (status != PJ_SUCCESS) {
-        PJ_PERROR(4,(THIS_FILE, status,
-                     "Error initializing libyuv converter"));
-    }
-#endif
-
 #if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0) && \
     defined(PJMEDIA_HAS_LIBSWSCALE) && (PJMEDIA_HAS_LIBSWSCALE != 0)
@@ -67 +59 @@
         PJ_PERROR(4,(THIS_FILE, status,
                      "Error initializing libswscale converter"));
+    }
+#endif
+
+#if defined(PJMEDIA_HAS_LIBYUV) && PJMEDIA_HAS_LIBYUV != 0
+    status = pjmedia_libyuv_converter_init(mgr);
+    if (status != PJ_SUCCESS) {
+        PJ_PERROR(4,(THIS_FILE, status,
+                     "Error initializing libyuv converter"));
     }
 #endif