ios: clean up log level

hhuahh · Jun 26, 2015 · eb90855 · eb90855
1 parent 34ae5ad
commit eb90855
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 21 deletions.
diff --git a/ijkmedia/ijkplayer/ff_ffplay.c b/ijkmedia/ijkplayer/ff_ffplay.c
@@ -2835,10 +2835,10 @@ static int lockmgr(void **mtx, enum AVLockOp op)
 
 static bool g_ffmpeg_global_inited = false;
 
-inline static int av_log_level_to_ffp_log_level(int av_log_level)
+inline static int log_level_av_to_ffp(int av_log_level)
 {
     int ffplv = IJK_LOG_VERBOSE;
-    if (av_log_level <= AV_LOG_ERROR)           ffplv = IJK_LOG_ERROR;
+    if      (av_log_level <= AV_LOG_ERROR)      ffplv = IJK_LOG_ERROR;
     else if (av_log_level <= AV_LOG_WARNING)    ffplv = IJK_LOG_WARN;
     else if (av_log_level <= AV_LOG_INFO)       ffplv = IJK_LOG_INFO;
     else if (av_log_level <= AV_LOG_VERBOSE)    ffplv = IJK_LOG_VERBOSE;
@@ -2849,19 +2849,20 @@ inline static int av_log_level_to_ffp_log_level(int av_log_level)
 
 static void ffp_log_callback_brief(void *ptr, int level, const char *fmt, va_list vl)
 {
-    int ffplv __unused = av_log_level_to_ffp_log_level(level);
     if (level > av_log_get_level())
         return;
 
+    int ffplv __unused = log_level_av_to_ffp(level);
     VLOG(ffplv, IJK_LOG_TAG, fmt, vl);
 }
 
 static void ffp_log_callback_report(void *ptr, int level, const char *fmt, va_list vl)
 {
-    int ffplv __unused = av_log_level_to_ffp_log_level(level);
     if (level > av_log_get_level())
         return;
 
+    int ffplv __unused = log_level_av_to_ffp(level);
+
     va_list vl2;
     char line[1024];
     static int print_prefix = 1;
@@ -2915,7 +2916,7 @@ void ffp_global_uninit()
     g_ffmpeg_global_inited = false;
 }
 
-void ffp_global_set_log_report(int use_report)
+void ffp_global_set_ff_log_report(int use_report)
 {
     if (use_report) {
         av_log_set_callback(ffp_log_callback_report);
@@ -2924,7 +2925,7 @@ void ffp_global_set_log_report(int use_report)
     }
 }
 
-void ffp_global_set_log_level(int log_level)
+void ffp_global_set_ff_log_level(int log_level)
 {
     av_log_set_level(log_level);
 }

diff --git a/ijkmedia/ijkplayer/ff_ffplay.h b/ijkmedia/ijkplayer/ff_ffplay.h
@@ -30,8 +30,8 @@
 
 void      ffp_global_init();
 void      ffp_global_uninit();
-void      ffp_global_set_log_report(int use_report);
-void      ffp_global_set_log_level(int log_level);
+void      ffp_global_set_ff_log_report(int use_report);
+void      ffp_global_set_ff_log_level(int log_level);
 void      ffp_io_stat_register(void (*cb)(const char *url, int type, int bytes));
 void      ffp_io_stat_complete_register(void (*cb)(const char *url,
                                                    int64_t read_bytes, int64_t total_size,

diff --git a/ijkmedia/ijkplayer/ijkplayer.c b/ijkmedia/ijkplayer/ijkplayer.c
@@ -71,14 +71,14 @@ void ijkmp_global_uninit()
     ffp_global_uninit();
 }
 
-void ijkmp_global_set_log_report(int use_report)
+void ijkmp_global_set_ff_log_report(int use_report)
 {
-    ffp_global_set_log_report(use_report);
+    ffp_global_set_ff_log_report(use_report);
 }
 
-void ijkmp_global_set_log_level(int log_level)
+void ijkmp_global_set_ff_log_level(int log_level)
 {
-    ffp_global_set_log_level(log_level);
+    ffp_global_set_ff_log_level(log_level);
 }
 
 void ijkmp_io_stat_register(void (*cb)(const char *url, int type, int bytes))

diff --git a/ijkmedia/ijkplayer/ijkplayer.h b/ijkmedia/ijkplayer/ijkplayer.h
@@ -30,7 +30,7 @@
 #include "ijkmeta.h"
 
 #ifndef MPTRACE
-#define MPTRACE ALOGW
+#define MPTRACE ALOGD
 #endif
 
 typedef struct IjkMediaPlayer IjkMediaPlayer;
@@ -152,8 +152,8 @@ typedef struct SDL_Vout SDL_Vout;
 
 void            ijkmp_global_init();
 void            ijkmp_global_uninit();
-void            ijkmp_global_set_log_report(int use_report);
-void            ijkmp_global_set_log_level(int log_level);
+void            ijkmp_global_set_ff_log_report(int use_report);
+void            ijkmp_global_set_ff_log_level(int log_level);   // log_level = AV_LOG_xxx
 void            ijkmp_io_stat_register(void (*cb)(const char *url, int type, int bytes));
 void            ijkmp_io_stat_complete_register(void (*cb)(const char *url,
                                                            int64_t read_bytes, int64_t total_size,

diff --git a/ios/IJKMediaPlayer/IJKMediaPlayer/IJKFFMoviePlayerController.h b/ios/IJKMediaPlayer/IJKMediaPlayer/IJKFFMoviePlayerController.h
@@ -88,8 +88,8 @@ typedef enum IJKAVLogLevel {
 - (void)setPauseInBackground:(BOOL)pause;
 - (BOOL)isVideoToolboxOpen;
 
-+ (void)setLogReport:(BOOL)preferLogReport;
-+ (void)setLogLevel:(IJKAVLogLevel)logLevel;
++ (void)setFFLogReport:(BOOL)preferLogReport;
++ (void)setFFLogLevel:(IJKAVLogLevel)logLevel;
 
 @property(nonatomic, readonly) CGFloat fpsInMeta;
 @property(nonatomic, readonly) CGFloat fpsAtOutput;

diff --git a/ios/IJKMediaPlayer/IJKMediaPlayer/IJKFFMoviePlayerController.m b/ios/IJKMediaPlayer/IJKMediaPlayer/IJKFFMoviePlayerController.m
@@ -346,14 +346,14 @@ - (void)setOptionIntValue:(NSInteger)value
     ijkmp_set_option_int(_mediaPlayer, getPlayerOption(category), [key UTF8String], value);
 }
 
-+ (void)setLogReport:(BOOL)preferLogReport
++ (void)setFFLogReport:(BOOL)preferLogReport
 {
-    ijkmp_global_set_log_report(preferLogReport ? 1 : 0);
+    ijkmp_global_set_ff_log_report(preferLogReport ? 1 : 0);
 }
 
-+ (void)setLogLevel:(IJKAVLogLevel)logLevel
++ (void)setFFLogLevel:(IJKAVLogLevel)logLevel
 {
-    ijkmp_global_set_log_level(logLevel);
+    ijkmp_global_set_ff_log_level(logLevel);
 }
 
 - (void)shutdown