diff options
| author | Piotr Srebrny <piotr.srebrny@qt.io> | 2022-10-24 14:24:35 +0200 |
|---|---|---|
| committer | Piotr Srebrny <piotr.srebrny@qt.io> | 2022-10-24 15:04:24 +0200 |
| commit | 572a89e2d433d1c935b96d6d9b966e459930c663 (patch) | |
| tree | e2305f6ad7aa5809f24916a484d97b5543628332 | |
| parent | e60baaf8f60a894519bc740353f86a93fddc9022 (diff) | |
Fix compiler error complaining about unused variable
Porting change done for 6.4
Change-Id: I9c37fc67983ed545d4a43250b99c2bf069120173
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
| -rw-r--r-- | src/multimedia/platform/darwin/avfvideobuffer.mm | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/multimedia/platform/darwin/avfvideobuffer.mm b/src/multimedia/platform/darwin/avfvideobuffer.mm index e74dc10a8..8bb4ebd27 100644 --- a/src/multimedia/platform/darwin/avfvideobuffer.mm +++ b/src/multimedia/platform/darwin/avfvideobuffer.mm @@ -193,14 +193,15 @@ quint64 AVFVideoBuffer::textureHandle(int plane) const #if QT_CONFIG(opengl) #ifdef Q_OS_MACOS CVOpenGLTextureCacheFlush(sink->cvOpenGLTextureCache, 0); - CVReturn cvret; // Create a CVPixelBuffer-backed OpenGL texture image from the texture cache. - cvret = CVOpenGLTextureCacheCreateTextureFromImage( + const CVReturn cvret = CVOpenGLTextureCacheCreateTextureFromImage( kCFAllocatorDefault, sink->cvOpenGLTextureCache, m_buffer, nil, &cvOpenGLTexture); + if (cvret != kCVReturnSuccess) + qWarning() << "OpenGL texture creation failed" << cvret; Q_ASSERT(CVOpenGLTextureGetTarget(cvOpenGLTexture) == GL_TEXTURE_RECTANGLE); // Get an OpenGL texture name from the CVPixelBuffer-backed OpenGL texture image. @@ -208,9 +209,8 @@ quint64 AVFVideoBuffer::textureHandle(int plane) const #endif #ifdef Q_OS_IOS CVOpenGLESTextureCacheFlush(sink->cvOpenGLESTextureCache, 0); - CVReturn cvret; // Create a CVPixelBuffer-backed OpenGL texture image from the texture cache. - cvret = CVOpenGLESTextureCacheCreateTextureFromImage( + const CVReturn cvret = CVOpenGLESTextureCacheCreateTextureFromImage( kCFAllocatorDefault, sink->cvOpenGLESTextureCache, m_buffer, @@ -223,6 +223,8 @@ quint64 AVFVideoBuffer::textureHandle(int plane) const GL_UNSIGNED_BYTE, 0, &cvOpenGLESTexture); + if (cvret != kCVReturnSuccess) + qWarning() << "OpenGL ES texture creation failed" << cvret; // Get an OpenGL texture name from the CVPixelBuffer-backed OpenGL texture image. return CVOpenGLESTextureGetName(cvOpenGLESTexture); |