VideoOutputOpenGL: Use gpuvideo verbosity for OpenGL video performance

- and adjust the descriptions of the gpu and gpuvideo logging options
MythTV · Sep 30, 2019 · b449f5e · b449f5e
1 parent 04a2952
commit b449f5e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/mythtv/libs/libmythbase/verbosedefs.h b/mythtv/libs/libmythbase/verbosedefs.h
@@ -171,11 +171,11 @@ VERBOSE_MAP(VB_STDIO,     0x2000000000ULL, true,
    programs that have debugging enabled.
  */
 VERBOSE_MAP(VB_GPU,       0x4000000000ULL, true,
-            "GPU Commercial Flagging messages")
+            "GPU OpenGL driver messages")
 VERBOSE_MAP(VB_GPUAUDIO,  0x8000000000ULL, true,
             "GPU Audio Processing messages")
 VERBOSE_MAP(VB_GPUVIDEO,  0x10000000000ULL, true,
-            "GPU Video Processing messages")
+            "GPU video rendering messages")
 VERBOSE_MAP(VB_REFCOUNT,  0x20000000000ULL, true,
             "Reference Count messages")
 VERBOSE_MAP(VB_HTTP,  0x40000000000ULL, true,

diff --git a/mythtv/libs/libmythtv/mythvtbcontext.cpp b/mythtv/libs/libmythtv/mythvtbcontext.cpp
@@ -64,7 +64,7 @@ int MythVTBContext::HwDecoderInit(AVCodecContext *Context)
     return -1;
 }
 
-bool MythVTBContext::CheckDecoderSupport(AVCodecContext **Context, uint StreamType, AVCodec **Codec)
+bool MythVTBContext::CheckDecoderSupport(AVCodecContext **Context, uint StreamType)
 {
     static bool initialised = false;
     static QVector<uint> supported;
@@ -125,7 +125,7 @@ MythCodecID MythVTBContext::GetSupportedCodec(AVCodecContext **Context,
         return failure;
 
     // Check decoder support
-    if (!CheckDecoderSupport(Context, StreamType, Codec))
+    if (!CheckDecoderSupport(Context, StreamType))
         return failure;
 
     (*Context)->pix_fmt = AV_PIX_FMT_VIDEOTOOLBOX;

diff --git a/mythtv/libs/libmythtv/mythvtbcontext.h b/mythtv/libs/libmythtv/mythvtbcontext.h
@@ -31,7 +31,7 @@ class MythVTBContext : public MythCodecContext
                                           const enum AVPixelFormat *PixFmt);
 
   private:
-    static bool CheckDecoderSupport      (AVCodecContext **Context, uint StreamType, AVCodec **Codec);
+    static bool CheckDecoderSupport      (AVCodecContext **Context, uint StreamType);
     static int  InitialiseDecoder        (AVCodecContext *Context);
 };
 

diff --git a/mythtv/libs/libmythtv/videoout_opengl.cpp b/mythtv/libs/libmythtv/videoout_opengl.cpp
@@ -121,7 +121,7 @@ VideoOutputOpenGL::VideoOutputOpenGL(const QString &Profile)
     // will report the execution time for the key GL code blocks
     // N.B. 'Upload' should always be zero when using hardware decoding and direct
     // rendering. Any copy cost for direct rendering will be included within 'Render'
-    if (VERBOSE_LEVEL_CHECK(VB_GPU | VB_PLAYBACK, LOG_INFO))
+    if (VERBOSE_LEVEL_CHECK(VB_GPUVIDEO, LOG_INFO))
     {
         m_openGLPerf = new MythOpenGLPerf("GLVidPerf: ", { "Upload:", "Clear:", "Render:", "Flush:", "Swap:" });
         if (!m_openGLPerf->isCreated())