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

Timestamp:

Mar 25, 2011 8:13:43 AM (13 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

File:

• pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia/converter.c (modified) (3 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)