logger: implement a static logger

This logger allows to be used across an application
The log level can be set at runtime.

Author: dabrain34

lib/esextractor.cpp

@@ -421,3 +421,9 @@ es_extractor_teardown (ESExtractor * extractor)
 {
   delete (extractor);
 }
+
+void
+es_extractor_set_log_level (uint8_t level)
+{
+  Logger::instance().setLogLevel(level);
+}

lib/esextractor.h

@@ -22,15 +22,66 @@
 #include <istream>
 #include <vector>
 
-//#define _DEBUG
-#ifdef _DEBUG
-#   define DBG(FMT, ...) printf(FMT "\n", ##__VA_ARGS__)
-#else
-#   define DBG(FMT, ...)
-#endif
-#define DUMP(FMT, ...) printf(FMT, ##__VA_ARGS__)
-#define INFO(FMT, ...) printf(FMT "\n", ##__VA_ARGS__)
-#define ERR(FMT, ...) printf("ERROR: " FMT "\n", ##__VA_ARGS__)
+#include <stdarg.h>
+#include <string.h>
+
+enum {
+  ES_LOG_LEVEL_NONE = 0,
+  ES_LOG_LEVEL_ERROR,
+  ES_LOG_LEVEL_INFO,
+  ES_LOG_LEVEL_DEBUG,
+  ES_LOG_LEVEL_MEMDUMP,
+  ES_LOG_LEVEL_MAX
+};
+
+class Logger {
+  public:
+  Logger() {
+    m_level = ES_LOG_LEVEL_ERROR;
+
+  }
+  static Logger& instance()
+  {
+    static Logger instance;
+    return instance;
+  }
+  int level() { return m_level;}
+  void setLogLevel(uint8_t level) {
+    m_level = level;
+    if (m_level > ES_LOG_LEVEL_MAX)
+      m_level=ES_LOG_LEVEL_DEBUG;
+  }
+  void createLog(const char *format, ...) {
+    va_list argptr;
+    va_start(argptr, format);
+    vfprintf(stdout, format, argptr);
+    va_end(argptr);
+  }
+
+  void createLogData(const uint8_t* buffer, uint32_t length, const char* format, ...) {
+    va_list argptr;
+    va_start(argptr, format);
+    vfprintf(stdout, format, argptr);
+    va_end(argptr);
+    for (uint32_t i = 0; i < length; i++) {
+      fprintf(stdout, "0x%.2X ", buffer[i]);
+    }
+    fprintf(stdout, "\n");
+  }
+
+  private:
+    uint8_t m_level;
+};
+
+#define __FILENAME__ (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__)
+
+#define LOGGER(LEVEL, PREFIX, FMT, SUFFIX, ...) if (LEVEL <= Logger::instance().level()) Logger::instance().createLog(PREFIX "%s:%d:%s:\t"  FMT SUFFIX,__FILENAME__,__LINE__,__FUNCTION__, ##__VA_ARGS__)
+#define LOGGER_DATA(LEVEL, DATA, LENGTH, PREFIX, FMT, SUFFIX, ...) if (LEVEL <= Logger::instance().level()) Logger::instance().createLogData(DATA, LENGTH, PREFIX "%s:%d:%s:\t"  FMT SUFFIX,__FILENAME__,__LINE__,__FUNCTION__, ##__VA_ARGS__)
+#define ERR(FMT, ...) LOGGER(ES_LOG_LEVEL_ERROR, "ESE_ERROR\t", FMT, "\n", ##__VA_ARGS__)
+#define INFO(FMT, ...) LOGGER(ES_LOG_LEVEL_INFO, "ESE_INFO\t", FMT, "\n", ##__VA_ARGS__)
+
+#define DBG(FMT, ...) LOGGER(ES_LOG_LEVEL_DEBUG, "ESE_DEBUG\t", FMT, "\n", ##__VA_ARGS__)
+#define MEM_DUMP(DATA, LENGTH, FMT, ...) LOGGER_DATA(ES_LOG_LEVEL_MEMDUMP, DATA, LENGTH, "ESE_MEMDUMP\t", FMT, "", ##__VA_ARGS__)
 
 #if (defined _WIN32 || defined __CYGWIN__) && !defined(ES_STATIC_COMPILATION)
   #ifdef BUILDING_ES_EXTRACTOR
@@ -46,16 +97,6 @@
   #endif
 #endif
 
-inline void
-printBufferHex (unsigned char *buffer, int size)
-{
-  for (int i = 0; i < size; i++) {
-    DUMP ("0x%.2X ", buffer[i]);
-  }
-  DUMP ("\n");
-}
-
-
 typedef enum ESExtractorVideoCodec {
   ES_EXTRACTOR_VIDEO_CODEC_UNKNOWN = 0,
   ES_EXTRACTOR_VIDEO_CODEC_H264,
@@ -172,6 +213,9 @@ int es_extractor_frame_count (ESExtractor * extractor);
 ES_EXTRACTOR_API
 void es_extractor_teardown (ESExtractor * demuxer);
 
+ES_EXTRACTOR_API
+void es_extractor_set_log_level (uint8_t level);
+
 #ifdef __cplusplus
 }
 #endif

test/test.cpp

@@ -35,9 +35,8 @@ class CmdLineParser{
             static const std::string empty_string("");
             return empty_string;
         }
-        bool optionExists(const std::string &option) const{
-            return std::find(this->tokens.begin(), this->tokens.end(), option)
-                   != this->tokens.end();
+        int optionExists(const std::string &option) const{
+            return std::count(this->tokens.begin(), this->tokens.end(), option);
         }
     private:
         std::vector <std::string> tokens;
@@ -62,15 +61,16 @@ dumpFrame (ESExtractor * esextractor, uint8_t * data, int data_size)
   const char *frame_type_name =
       frameTypeName (es_extractor_video_codec (esextractor));
   INFO ("Got a %s frame of size %d", frame_type_name, data_size);
-  printBufferHex (data, data_size);
+  MEM_DUMP (data, data_size, "Buffer=");
 }
 
 int
-parseFile (const char *fileName, ESExtractorPacketAlignment alignment, bool debug)
+parseFile (const char *fileName, ESExtractorPacketAlignment alignment, uint8_t debug_level)
 {
   ESExtractorResult res;
   ESEPacket *pkt;
   ESExtractor *esextractor = es_extractor_new (fileName, alignment);
+  es_extractor_set_log_level (debug_level);
 
   if (!esextractor) {
     ERR ("Unable to discover a compatible stream. Exit");
@@ -80,8 +80,8 @@ parseFile (const char *fileName, ESExtractorPacketAlignment alignment, bool debu
   while ((res =
           es_extractor_read_frame (esextractor,
               &pkt)) < ES_EXTRACTOR_RESULT_EOS) {
-    if (debug)
-      dumpFrame (esextractor, pkt->data, pkt->data_size);
+
+    dumpFrame (esextractor, pkt->data, pkt->data_size);
     es_extractor_clear_packet (pkt);
   }
   es_extractor_clear_packet (pkt);
@@ -91,22 +91,36 @@ parseFile (const char *fileName, ESExtractorPacketAlignment alignment, bool debu
   return 0;
 }
 
+void usage(int argc, char *argv[]) {
+  std::cout << "Usage: " << argv[0] << " -f input_file" << std::endl;
+  std::cout << std::endl;
+  std::cout << "Options: "<< std::endl;
+  std::cout << "-h:\t show this help message and exit"<< std::endl;
+  std::cout << "-d:\t increment the debug level which each occurences (ie -d -d = level info(2))"<< std::endl;
+}
+
 int
 main (int argc, char *argv[])
 {
   int res = 0;
-  bool debug = false;
+  uint8_t debug = ES_LOG_LEVEL_ERROR;
 
   std::ofstream myfile;
 
   CmdLineParser cmdLine(argc, argv);
-  if(cmdLine.optionExists("-d")){
-    debug = true;
+  if(cmdLine.optionExists("-h")) {
+    usage(argc, argv);
+    return 0;
+  }
+
+  for (int i = 0; i < cmdLine.optionExists("-d"); i++){
+    debug ++;
   }
 
   const std::string &fileName = cmdLine.getOption("-f");
   if (fileName.empty()){
-    std::cerr << "Error: No input file specified. Usage: " << std::endl;
+    std::cerr << "Error: No input file specified." << std::endl;
+    usage(argc, argv);
     return -1;
   }