Changeset 4056 for pjproject/trunk

Timestamp:

Apr 17, 2012 2:48:29 AM (13 years ago)

Author:

nanang

Message:

Misc (re #1446): redirect ffmpeg logging with custom log callback.

Location:

pjproject/trunk/pjmedia/src

Files:

• pjmedia-codec/ffmpeg_vid_codecs.c (modified) (2 diffs)
• pjmedia/converter_libswscale.c (modified) (2 diffs)
• pjmedia/ffmpeg_util.c (modified) (3 diffs)

pjproject/trunk/pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c

@@ -594 +594 @@
         goto on_error;
 
+    pjmedia_ffmpeg_add_ref();
     avcodec_init();
     avcodec_register_all();
-    av_log_set_level(AV_LOG_ERROR);
 
     /* Enum FFMPEG codecs */
@@ -855 +855 @@
     ffmpeg_factory.pool = NULL;
 
+    pjmedia_ffmpeg_dec_ref();
+
     return status;
 }

pjproject/trunk/pjmedia/src/pjmedia/converter_libswscale.c

@@ -185 +185 @@
 {
     libswscale_factory.op = &libswscale_factory_op;
+    pjmedia_ffmpeg_add_ref();
     return pjmedia_converter_mgr_register_factory(mgr, &libswscale_factory);
 }
@@ -194 +195 @@
 {
     PJ_UNUSED_ARG(pool);
+    pjmedia_ffmpeg_dec_ref();
     return pjmedia_converter_mgr_unregister_factory(mgr, &libswscale_factory,
                                                     PJ_TRUE);

pjproject/trunk/pjmedia/src/pjmedia/ffmpeg_util.c

@@ -19 +19 @@
 #include <pjmedia/types.h>
 #include <pj/errno.h>
+#include <pj/log.h>
+#include <pj/string.h>
 
 #if PJMEDIA_HAS_LIBAVFORMAT && PJMEDIA_HAS_LIBAVUTIL
@@ -75 +77 @@
 static int pjmedia_ffmpeg_ref_cnt;
 
+static void ffmpeg_log_cb(void* ptr, int level, const char* fmt, va_list vl);
+
 void pjmedia_ffmpeg_add_ref()
 {
     if (pjmedia_ffmpeg_ref_cnt++ == 0) {
+        av_log_set_level(AV_LOG_ERROR);
+        av_log_set_callback(&ffmpeg_log_cb);
         av_register_all();
     }
@@ -90 +96 @@
     if (pjmedia_ffmpeg_ref_cnt < 0) pjmedia_ffmpeg_ref_cnt = 0;
 }
+
+
+static void ffmpeg_log_cb(void* ptr, int level, const char* fmt, va_list vl)
+{
+    const char *LOG_SENDER = "ffmpeg";
+    enum { LOG_LEVEL = 5 };
+    char buf[100];
+    int bufsize = sizeof(buf), len;
+    pj_str_t fmt_st;
+
+    /* Custom callback needs to filter log level by itself */
+    if (level > av_log_get_level())
+        return;
+    
+    /* Add original ffmpeg sender to log format */
+    if (ptr) {
+        AVClass* avc = *(AVClass**)ptr;
+        len = pj_ansi_snprintf(buf, bufsize, "%s: ", avc->item_name(ptr));
+        bufsize -= len;
+    }
+
+    /* Copy original log format */
+    len = pj_ansi_strlen(fmt);
+    if (len > bufsize-1)
+        len = bufsize-1;
+    pj_memcpy(buf+sizeof(buf)-bufsize, fmt, len);
+    bufsize -= len;
+
+    /* Trim log format */
+    pj_strset(&fmt_st, buf, sizeof(buf)-bufsize);
+    pj_strrtrim(&fmt_st);
+    buf[fmt_st.slen] = '\0';
+
+    pj_log(LOG_SENDER, LOG_LEVEL, buf, vl);
+}
+
 
 pj_status_t pjmedia_format_id_to_PixelFormat(pjmedia_format_id fmt_id,