Adding Logging over mulitple lines for querying opengl

diff --git a/log.cc b/log.cc
old mode 100644 (file)
new mode 100755 (executable)
index 5ed65f6..2c39da1
--- a/log.cc
+++ b/log.cc
@@ -198,7 +198,19 @@ int Log::log(const char *fromModule, int level,const char* message, ...)
 \r
 }\r
 \r
+void Log::logLongString(const char *fromModule, int level,const char *message)\r
+{\r
+       int string_size=strlen(message);\r
+       char buffer[100];\r
+       const char * pointer=message;\r
+       for (int str_written=0; str_written<string_size;str_written+=119) {\r
+               strncpy(buffer,pointer,99);\r
+               buffer[99]=0;\r
+               pointer+=99;\r
+               log(fromModule,level,"%s",buffer);\r
+       }\r
 \r
+}\r
 \r
 int Log::status()\r
 {\r

diff --git a/log.h b/log.h
old mode 100644 (file)
new mode 100755 (executable)
index ed24b8b..1c3528d
--- a/log.h
+++ b/log.h
@@ -53,6 +53,7 @@ class Log
     int init(int defaultLevel,const char* fileName, int enabled);\r
     int shutdown();\r
     int log(const char *fromModule, int level,const char *message, ...);\r
+    void logLongString(const char *fromModule, int level,const char *message);\r
     int status();\r
     void upLogLevel();\r
     void downLogLevel();\r

diff --git a/osdopengl.cc b/osdopengl.cc
index 969c12de99f9c890a10584ab298c614e35ed3be1..f368c6aedacc6775a173c2462c2f5091eeeebac9 100755 (executable)
--- a/osdopengl.cc
+++ b/osdopengl.cc
@@ -115,10 +115,10 @@ int OsdOpenGL::init(void* device)
    }\r
 \r
    const char *query_str=eglQueryString(egl_display,EGL_CLIENT_APIS);\r
-   if (query_str) Log::getInstance()->log("OSD", Log::NOTICE, "%s",query_str);\r
+   if (query_str) Log::getInstance()->logLongString("OSD", Log::NOTICE, query_str);\r
    else Log::getInstance()->log("OSD", Log::WARN, "Could not query display %x",eglGetError());\r
    query_str=eglQueryString(egl_display,EGL_EXTENSIONS);\r
-   if (query_str)    Log::getInstance()->log("OSD", Log::NOTICE, "%s",query_str);\r
+   if (query_str)    Log::getInstance()->logLongString("OSD", Log::NOTICE, query_str);\r
    else Log::getInstance()->log("OSD", Log::WARN, "Could not query display %x",eglGetError());\r
 \r
    const EGLint attributs[]={\r
@@ -185,6 +185,22 @@ int OsdOpenGL::init(void* device)
    }\r
    // Test stuff\r
 \r
+   query_str=(const char*)glGetString(GL_VERSION) ;\r
+   if (query_str) Log::getInstance()->logLongString("OSD", Log::NOTICE, query_str);\r
+   else Log::getInstance()->log("OSD", Log::WARN, "Could not query display %x",glGetError());\r
+\r
+   query_str=(const char*)glGetString(GL_VENDOR) ;\r
+   if (query_str) Log::getInstance()->logLongString("OSD", Log::NOTICE, query_str);\r
+   else Log::getInstance()->log("OSD", Log::WARN, "Could not query display %x",glGetError());\r
+\r
+   query_str=(const char*)glGetString(GL_RENDERER) ;\r
+   if (query_str) Log::getInstance()->logLongString("OSD", Log::NOTICE, query_str);\r
+   else Log::getInstance()->log("OSD", Log::WARN, "Could not query display %x",glGetError());\r
+\r
+   query_str=(const char*)glGetString(GL_EXTENSIONS) ;\r
+   if (query_str) Log::getInstance()->logLongString("OSD", Log::NOTICE, query_str);\r
+   else Log::getInstance()->log("OSD", Log::WARN, "Could not query display %x",glGetError());\r
+\r
 \r
 \r
   //Now we will create the Screen\r

diff --git a/videovpeogl.cc b/videovpeogl.cc
index 95bafb252150a41143e98e310d55aca2e69de688..6c7bed4d2c28f456a71523290220061cbec16828 100755 (executable)
--- a/videovpeogl.cc
+++ b/videovpeogl.cc
@@ -462,15 +462,6 @@ int VideoVPEOGL::AllocateCodecsOMX()
 
 
 
-
-
-
-
-
-
-
-
-
        OMX_VIDEO_PARAM_PORTFORMATTYPE ft_type;
        ft_type.nSize=sizeof(ft_type);
        ft_type.nVersion.nVersion=OMX_VERSION;
@@ -482,6 +473,14 @@ int VideoVPEOGL::AllocateCodecsOMX()
                ft_type.eCompressionFormat=OMX_VIDEO_CodingMPEG2;
        }
 
+       Demuxer* demux=Demuxer::getInstance();
+
+    ft_type.xFramerate=demux->getFrameRate()*(1<<16);
+       error=OMX_SetParameter(omx_vid_dec,OMX_IndexParamVideoPortFormat,&ft_type);
+       if (error!=OMX_ErrorNone){
+               Log::getInstance()->log("Video", Log::DEBUG, "Init OMX_IndexParamVideoPortFormat failed %x", error);
+       }
+
 
        error=OMX_SendCommand(omx_vid_dec,OMX_CommandStateSet,OMX_StateIdle,0);
        if (error!=OMX_ErrorNone){
@@ -489,13 +488,7 @@ int VideoVPEOGL::AllocateCodecsOMX()
                return 0;
        }
 
-       Demuxer* demux=Demuxer::getInstance();
 
-    ft_type.xFramerate=demux->getFrameRate()*(1<<16);
-       error=OMX_SetParameter(omx_vid_dec,OMX_IndexParamVideoPortFormat,&ft_type);
-       if (error!=OMX_ErrorNone){
-               Log::getInstance()->log("Video", Log::DEBUG, "Init OMX_IndexParamVideoPortFormat failed %x", error);
-       }
 /*
        if (h264) {
                OMX_NALSTREAMFORMATTYPE nalu_type;
@@ -518,7 +511,8 @@ int VideoVPEOGL::AllocateCodecsOMX()
                return 0;
        }
 
-
+       //TODO activate this code
+/*
        error=OMX_SetupTunnel(omx_vid_dec,omx_codec_output_port,omx_vid_sched,omx_shed_input_port);
        if (error!=OMX_ErrorNone){
                Log::getInstance()->log("Video", Log::DEBUG, "OMX_Setup tunnel dec to sched failed %x", error);
@@ -533,7 +527,7 @@ int VideoVPEOGL::AllocateCodecsOMX()
                Log::getInstance()->log("Video", Log::DEBUG, "OMX_Setup tunnel  sched to rend failed %x", error);
                DeAllocateCodecsOMX();
                return 0;
-       }
+       }*/