From 7b02027edf712be6eef8b99f7f2e334a38df2ed2 Mon Sep 17 00:00:00 2001 From: Mark Kendall Date: Thu, 9 Jan 2020 11:07:46 +0000 Subject: [PATCH] Sundry cleanup --- mythtv/libs/libmythtv/decoders/mythv4l2m2mcontext.cpp | 6 +++--- mythtv/libs/libmythtv/opengl/mythdrmprimeinterop.cpp | 3 +-- mythtv/libs/libmythtv/opengl/mythmediacodecinterop.cpp | 1 - mythtv/libs/libmythtv/opengl/mythnvdecinterop.cpp | 3 +-- mythtv/libs/libmythtv/opengl/mythopenglinterop.cpp | 3 +-- mythtv/libs/libmythtv/opengl/mythvaapidrminterop.cpp | 1 - mythtv/libs/libmythtv/opengl/mythvaapidrminterop.h | 2 +- mythtv/libs/libmythtv/opengl/mythvaapiglxinterop.h | 4 ++-- mythtv/libs/libmythui/mythdisplay.h | 2 +- mythtv/libs/libmythui/mythdisplaymode.cpp | 2 +- mythtv/libs/libmythui/platforms/mythdisplayx11.cpp | 1 + mythtv/libs/libmythui/platforms/mythxdisplay.cpp | 4 ++-- 12 files changed, 14 insertions(+), 18 deletions(-) diff --git a/mythtv/libs/libmythtv/decoders/mythv4l2m2mcontext.cpp b/mythtv/libs/libmythtv/decoders/mythv4l2m2mcontext.cpp index 82691708e64..0f15058ca41 100644 --- a/mythtv/libs/libmythtv/decoders/mythv4l2m2mcontext.cpp +++ b/mythtv/libs/libmythtv/decoders/mythv4l2m2mcontext.cpp @@ -346,12 +346,12 @@ AVPixelFormat MythV4L2M2MContext::GetV4L2RequestFormat(AVCodecContext *Context, { while (*PixFmt != AV_PIX_FMT_NONE) { - if (*PixFmt == AV_PIX_FMT_DRM_PRIME) { + if (*PixFmt == AV_PIX_FMT_DRM_PRIME) + { if (MythCodecContext::InitialiseDecoder(Context, MythV4L2M2MContext::InitialiseV4L2RequestContext, "V4L2 request context creation") >= 0) return AV_PIX_FMT_DRM_PRIME; - -} + } PixFmt++; } return AV_PIX_FMT_NONE; diff --git a/mythtv/libs/libmythtv/opengl/mythdrmprimeinterop.cpp b/mythtv/libs/libmythtv/opengl/mythdrmprimeinterop.cpp index dd3e616be3b..b8c8141048a 100644 --- a/mythtv/libs/libmythtv/opengl/mythdrmprimeinterop.cpp +++ b/mythtv/libs/libmythtv/opengl/mythdrmprimeinterop.cpp @@ -28,8 +28,7 @@ void MythDRMPRIMEInterop::DeleteTextures(void) if (!m_openglTextures.isEmpty() && m_context->IsEGL()) { int count = 0; - for (auto it = m_openglTextures.constBegin(); - it != m_openglTextures.constEnd(); ++it) + for (auto it = m_openglTextures.constBegin(); it != m_openglTextures.constEnd(); ++it) { vector textures = it.value(); for (auto & texture : textures) diff --git a/mythtv/libs/libmythtv/opengl/mythmediacodecinterop.cpp b/mythtv/libs/libmythtv/opengl/mythmediacodecinterop.cpp index 8a2475c5eae..dc9cda21c25 100644 --- a/mythtv/libs/libmythtv/opengl/mythmediacodecinterop.cpp +++ b/mythtv/libs/libmythtv/opengl/mythmediacodecinterop.cpp @@ -87,7 +87,6 @@ bool MythMediaCodecInterop::Initialise(QSize Size) // Create surface m_surfaceTexture = QAndroidJniObject("android/graphics/SurfaceTexture", "(I)V", texture->m_textureId); - //N.B. org/mythtv/android/SurfaceTextureListener is found in the packaging repo m_surfaceListener = QAndroidJniObject("org/mythtv/video/SurfaceTextureListener", "(J)V", jlong(&m_frameWait)); if (m_surfaceTexture.isValid() && m_surfaceListener.isValid()) { diff --git a/mythtv/libs/libmythtv/opengl/mythnvdecinterop.cpp b/mythtv/libs/libmythtv/opengl/mythnvdecinterop.cpp index ce8dc345c3f..319a9760cdd 100644 --- a/mythtv/libs/libmythtv/opengl/mythnvdecinterop.cpp +++ b/mythtv/libs/libmythtv/opengl/mythnvdecinterop.cpp @@ -42,8 +42,7 @@ void MythNVDECInterop::DeleteTextures(void) if (!m_openglTextures.isEmpty()) { LOG(VB_PLAYBACK, LOG_INFO, LOC + "Deleting CUDA resources"); - for (auto it = m_openglTextures.constBegin(); - it != m_openglTextures.constEnd(); ++it) + for (auto it = m_openglTextures.constBegin(); it != m_openglTextures.constEnd(); ++it) { vector textures = it.value(); for (auto & texture : textures) diff --git a/mythtv/libs/libmythtv/opengl/mythopenglinterop.cpp b/mythtv/libs/libmythtv/opengl/mythopenglinterop.cpp index 5321da9b251..45c1ab6ee7d 100644 --- a/mythtv/libs/libmythtv/opengl/mythopenglinterop.cpp +++ b/mythtv/libs/libmythtv/opengl/mythopenglinterop.cpp @@ -249,8 +249,7 @@ void MythOpenGLInterop::DeleteTextures(void) { OpenGLLocker locker(m_context); int count = 0; - for (auto it = m_openglTextures.constBegin(); - it != m_openglTextures.constEnd(); ++it) + for (auto it = m_openglTextures.constBegin(); it != m_openglTextures.constEnd(); ++it) { vector textures = it.value(); for (auto & texture : textures) diff --git a/mythtv/libs/libmythtv/opengl/mythvaapidrminterop.cpp b/mythtv/libs/libmythtv/opengl/mythvaapidrminterop.cpp index dd0417027ce..bf86f772674 100644 --- a/mythtv/libs/libmythtv/opengl/mythvaapidrminterop.cpp +++ b/mythtv/libs/libmythtv/opengl/mythvaapidrminterop.cpp @@ -427,7 +427,6 @@ void MythVAAPIInteropDRM::CleanupDRMPRIME(void) return; LOG(VB_PLAYBACK, LOG_INFO, LOC + QString("Releasing %1 DRM descriptors").arg(m_drmFrames.size())); - // NOLINTNEXTLINE(modernize-loop-convert) for (auto it = m_drmFrames.begin() ; it != m_drmFrames.end(); ++it) { for (int i = 0; i < (*it)->nb_objects; i++) diff --git a/mythtv/libs/libmythtv/opengl/mythvaapidrminterop.h b/mythtv/libs/libmythtv/opengl/mythvaapidrminterop.h index c9c26b42626..7bd29285efe 100644 --- a/mythtv/libs/libmythtv/opengl/mythvaapidrminterop.h +++ b/mythtv/libs/libmythtv/opengl/mythvaapidrminterop.h @@ -15,7 +15,7 @@ class MythVAAPIInteropDRM : public MythVAAPIInterop, public MythEGLDMABUF ~MythVAAPIInteropDRM() override; vector Acquire(MythRenderOpenGL *Context, VideoColourSpace *ColourSpace, - VideoFrame *Frame,FrameScanType Scan) final; + VideoFrame *Frame,FrameScanType Scan) override final; static bool IsSupported(MythRenderOpenGL *Context); void DeleteTextures(void) override; diff --git a/mythtv/libs/libmythtv/opengl/mythvaapiglxinterop.h b/mythtv/libs/libmythtv/opengl/mythvaapiglxinterop.h index daa8c9eebb8..3565f8b069d 100644 --- a/mythtv/libs/libmythtv/opengl/mythvaapiglxinterop.h +++ b/mythtv/libs/libmythtv/opengl/mythvaapiglxinterop.h @@ -34,7 +34,7 @@ class MythVAAPIInteropGLXCopy : public MythVAAPIInteropGLX ~MythVAAPIInteropGLXCopy() override; vector Acquire(MythRenderOpenGL *Context, VideoColourSpace *ColourSpace, - VideoFrame *Frame, FrameScanType Scan) final; + VideoFrame *Frame, FrameScanType Scan) override final; private: void* m_glxSurface { nullptr }; @@ -52,7 +52,7 @@ class MythVAAPIInteropGLXPixmap : public MythVAAPIInteropGLX ~MythVAAPIInteropGLXPixmap() override; vector Acquire(MythRenderOpenGL *Context, VideoColourSpace *ColourSpace, - VideoFrame *Frame, FrameScanType Scan) final; + VideoFrame *Frame, FrameScanType Scan) override final; static bool IsSupported(MythRenderOpenGL *Context); private: diff --git a/mythtv/libs/libmythui/mythdisplay.h b/mythtv/libs/libmythui/mythdisplay.h index 158937f15a4..e0d6d495b72 100644 --- a/mythtv/libs/libmythui/mythdisplay.h +++ b/mythtv/libs/libmythui/mythdisplay.h @@ -54,7 +54,7 @@ class MUI_PUBLIC MythDisplay : public QObject, public ReferenceCounter static void PrimaryScreenChanged (QScreen *qScreen); void ScreenAdded (QScreen *qScreen); void ScreenRemoved (QScreen *qScreen); - static void GeometryChanged (const QRect &Geometry); + void GeometryChanged (const QRect &Geometry); signals: void CurrentScreenChanged (QScreen *qScreen); diff --git a/mythtv/libs/libmythui/mythdisplaymode.cpp b/mythtv/libs/libmythui/mythdisplaymode.cpp index 3087ca97f96..8939d7b27fe 100644 --- a/mythtv/libs/libmythui/mythdisplaymode.cpp +++ b/mythtv/libs/libmythui/mythdisplaymode.cpp @@ -52,7 +52,7 @@ void MythDisplayMode::Init(void) QSize MythDisplayMode::Resolution(void) const { - return {m_width, m_height}; + return { m_width, m_height }; } int MythDisplayMode::Width(void) const diff --git a/mythtv/libs/libmythui/platforms/mythdisplayx11.cpp b/mythtv/libs/libmythui/platforms/mythdisplayx11.cpp index 0ffc985727a..3afbbe8f021 100644 --- a/mythtv/libs/libmythui/platforms/mythdisplayx11.cpp +++ b/mythtv/libs/libmythui/platforms/mythdisplayx11.cpp @@ -10,6 +10,7 @@ #define LOC QString("DisplayX11: ") MythDisplayX11::MythDisplayX11() + : MythDisplay() { Initialise(); } diff --git a/mythtv/libs/libmythui/platforms/mythxdisplay.cpp b/mythtv/libs/libmythui/platforms/mythxdisplay.cpp index c7332f1d5fd..e148776ab8d 100644 --- a/mythtv/libs/libmythui/platforms/mythxdisplay.cpp +++ b/mythtv/libs/libmythui/platforms/mythxdisplay.cpp @@ -110,7 +110,7 @@ QSize MythXDisplay::GetDisplaySize(void) DisplayHeight(m_disp, m_screenNum)); } - return {mode.hdisplay, mode.vdisplay}; + return { mode.hdisplay, mode.vdisplay }; } /** @@ -123,7 +123,7 @@ QSize MythXDisplay::GetDisplayDimensions(void) MythXLocker locker(this); int displayWidthMM = DisplayWidthMM( m_disp, m_screenNum); int displayHeightMM = DisplayHeightMM(m_disp, m_screenNum); - return {displayWidthMM, displayHeightMM}; + return { displayWidthMM, displayHeightMM }; } double MythXDisplay::GetRefreshRate(void)