slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

AVFoundation: fix camera frames texture format.

Browse Source 
Change-Id: I87ca4abf80a5be9983aefc791b8a0ef0cd4ac33d
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
This commit is contained in:
Yoann Lopes
2015-09-29 16:04:35 +02:00
parent 5232c993a1
commit d1bf781c66
1 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/avfoundation/camera/avfcamerarenderercontrol.mm
View File

@@ -174,7 +174,7 @@ public:
GL_RGBA, GL_RGBA,
CVPixelBufferGetWidth(m_buffer), CVPixelBufferGetWidth(m_buffer),
CVPixelBufferGetHeight(m_buffer), CVPixelBufferGetHeight(m_buffer),
GL_BGRA, GL_RGBA,
GL_UNSIGNED_BYTE, GL_UNSIGNED_BYTE,
0, 0,
&m_texture); &m_texture);
@@ -240,18 +240,8 @@ private:
int width = CVPixelBufferGetWidth(imageBuffer); int width = CVPixelBufferGetWidth(imageBuffer);
int height = CVPixelBufferGetHeight(imageBuffer); int height = CVPixelBufferGetHeight(imageBuffer);
QVideoFrame::PixelFormat format; QVideoFrame::PixelFormat format =
AVFCameraViewfinderSettingsControl2::QtPixelFormatFromCVFormat(CVPixelBufferGetPixelFormatType(imageBuffer));
#ifdef Q_OS_IOS
bool useTexture = m_renderer->supportsTextures()
&& CVPixelBufferGetPixelFormatType(imageBuffer) == kCVPixelFormatType_32BGRA;
if (useTexture)
format = QVideoFrame::Format_BGRA32;
else
#endif
format = AVFCameraViewfinderSettingsControl2::QtPixelFormatFromCVFormat(CVPixelBufferGetPixelFormatType(imageBuffer));
if (format == QVideoFrame::Format_Invalid) if (format == QVideoFrame::Format_Invalid)
return; return;