Changeset 3487

Timestamp:

Mar 25, 2011 8:13:43 AM (14 years ago)

Author:

bennylp

Message:

libswscale rearrangement (re #1219/ffmpeg codecs): instantiate libswscale converter from the converter manager instead of having to instantiate it manually in all apps

Location:

pjproject/branches/projects/2.0-dev

Files:

• pjmedia/src/pjmedia/converter.c (modified) (3 diffs)
• pjmedia/src/pjmedia/converter_libswscale.c (modified) (1 diff)
• pjsip-apps/src/samples/aviplay.c (modified) (2 diffs)
• pjsip/src/pjsua-lib/pjsua_media.c (modified) (2 diffs)

pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia/converter.c

@@ -21 +21 @@
 #include <pj/errno.h>
 
+#define THIS_FILE       "converter.c"
 
 struct pjmedia_converter_mgr
@@ -29 +30 @@
 static pjmedia_converter_mgr *converter_manager_instance;
 
+#if PJMEDIA_HAS_LIBSWSCALE && PJMEDIA_HAS_LIBAVUTIL
+PJ_DECL(pj_status_t)
+pjmedia_libswscale_converter_init(pjmedia_converter_mgr *mgr);
+#endif
+
+
 PJ_DEF(pj_status_t) pjmedia_converter_mgr_create(pj_pool_t *pool,
                                                  pjmedia_converter_mgr **p_mgr)
 {
     pjmedia_converter_mgr *mgr;
+    pj_status_t status;
 
     mgr = PJ_POOL_ALLOC_T(pool, pjmedia_converter_mgr);
@@ -39 +47 @@
     if (!converter_manager_instance)
         converter_manager_instance = mgr;
+
+#if PJMEDIA_HAS_LIBSWSCALE && PJMEDIA_HAS_LIBAVUTIL
+    status = pjmedia_libswscale_converter_init(mgr);
+    if (status != PJ_SUCCESS) {
+        PJ_PERROR(4,(THIS_FILE, status,
+                     "Error initializing libswscale converter"));
+    }
+#endif
 
     if (p_mgr)

pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia/converter_libswscale.c

@@ -177 +177 @@
 
 PJ_DEF(pj_status_t)
-pjmedia_libswscale_converter_init(pjmedia_converter_mgr *mgr,
-                                  pj_pool_t *pool)
+pjmedia_libswscale_converter_init(pjmedia_converter_mgr *mgr)
 {
     libswscale_factory.op = &libswscale_factory_op;
-    PJ_UNUSED_ARG(pool);
     return pjmedia_converter_mgr_register_factory(mgr, &libswscale_factory);
 }

pjproject/branches/projects/2.0-dev/pjsip-apps/src/samples/aviplay.c

@@ -58 +58 @@
 /* For logging purpose. */
 #define THIS_FILE   "aviplay.c"
-
-pj_status_t
-pjmedia_libswscale_converter_init(pjmedia_converter_mgr *mgr,
-                                  pj_pool_t *pool);
 
 static const char *desc = 
@@ -330 +326 @@
                 pjmedia_conversion_param conv_param;
                 
-                status = pjmedia_libswscale_converter_init(NULL, pool);
-                
                 pjmedia_format_copy(&conv_param.src, &param.vidparam.fmt);
                 pjmedia_format_copy(&conv_param.dst, &param.vidparam.fmt);

pjproject/branches/projects/2.0-dev/pjsip/src/pjsua-lib/pjsua_media.c

@@ -60 +60 @@
 
 
-PJ_DECL(pj_status_t)
-pjmedia_libswscale_converter_init(pjmedia_converter_mgr *mgr,
-                                  pj_pool_t *pool);
-
 /**
  * Init media subsystems.
@@ -315 +311 @@
     if (status != PJ_SUCCESS) {
         pjsua_perror(THIS_FILE, "Error initializing ffmpeg library",
-                     status);
-        return status;
-    }
-#endif
-
-#if PJMEDIA_HAS_VIDEO && PJMEDIA_HAS_LIBSWSCALE && PJMEDIA_HAS_LIBAVUTIL
-    status = pjmedia_libswscale_converter_init(NULL, pjsua_var.pool);
-    if (status != PJ_SUCCESS) {
-        pjsua_perror(THIS_FILE, "Error initializing libswscale converter",
                      status);
         return status;