Changeset 6101

Timestamp:

Nov 6, 2019 8:10:42 AM (5 years ago)

Author:

riza

Message:

Close #2250: Enable OpenH264 native log.

Location:

pjproject/trunk/pjmedia

Files:

• include/pjmedia-codec/config.h (modified) (1 diff)
• src/pjmedia-codec/openh264.cpp (modified) (3 diffs)

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

@@ -572 +572 @@
 
 /**
+ * Determine the log level of the native openH264 log which will be forwarded
+ * to the library's log.
+ * Set to WELS_LOG_QUIET to disable logging, or WELS_LOG_DETAIL for debugging.
+ *
+ * Default: WELS_LOG_ERROR.
+ */
+#ifndef PJMEDIA_CODEC_OPENH264_LOG_LEVEL
+#   define PJMEDIA_CODEC_OPENH264_LOG_LEVEL  WELS_LOG_ERROR
+#endif
+/**
  * @}
  */

pjproject/trunk/pjmedia/src/pjmedia-codec/openh264.cpp

@@ -168 +168 @@
 };
 
+static void log_print(void* ctx, int level, const char* string) {
+    PJ_LOG(4,("[OPENH264_LOG]", "[L%d] %s", level, string));
+}
+
 PJ_DEF(pj_status_t) pjmedia_codec_openh264_vid_init(pjmedia_vid_codec_mgr *mgr,
                                                     pj_pool_factory *pf)
@@ -329 +333 @@
     oh264_codec_data *oh264_data;
     int rc;
+    WelsTraceCallback log_cb = &log_print;
+    int log_level = PJMEDIA_CODEC_OPENH264_LOG_LEVEL;
 
     PJ_ASSERT_RETURN(factory == &oh264_factory.base && info && p_codec,
@@ -360 +366 @@
     if (rc != 0)
         goto on_error;
+
+    oh264_data->enc->SetOption(ENCODER_OPTION_TRACE_LEVEL, &log_level);
+    oh264_data->enc->SetOption(ENCODER_OPTION_TRACE_CALLBACK, &log_cb);
+    oh264_data->dec->SetOption(DECODER_OPTION_TRACE_LEVEL, &log_level);
+    oh264_data->dec->SetOption(DECODER_OPTION_TRACE_CALLBACK, &log_cb);
 
     *p_codec = codec;