This is an automatic generated email to let you know that the following patch were queued at the http://git.linuxtv.org/cgit.cgi/v4l-utils.git tree:
Subject: qv4l2: gl: Add support for V4L2_PIX_FMT_Y16 Author: Ricardo Ribalda <[email protected]> Date: Tue May 19 11:03:04 2015 +0200 Add support for a 16 bit wide greyscale format. Signed-off-by: Ricardo Ribalda Delgado <[email protected]> Signed-off-by: Hans Verkuil <[email protected]> utils/qv4l2/capture-win-gl.cpp | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) --- http://git.linuxtv.org/cgit.cgi/v4l-utils.git/commit/?id=f7dc1893b19e1de233a9a2e8d7b475660b1d3487 diff --git a/utils/qv4l2/capture-win-gl.cpp b/utils/qv4l2/capture-win-gl.cpp index 2783c63..77a9678 100644 --- a/utils/qv4l2/capture-win-gl.cpp +++ b/utils/qv4l2/capture-win-gl.cpp @@ -386,6 +386,7 @@ bool CaptureWinGLEngine::hasNativeFormat(__u32 format) V4L2_PIX_FMT_YUV565, V4L2_PIX_FMT_YUV32, V4L2_PIX_FMT_GREY, + V4L2_PIX_FMT_Y16, 0 }; @@ -481,6 +482,7 @@ void CaptureWinGLEngine::changeShader() case V4L2_PIX_FMT_ARGB32: case V4L2_PIX_FMT_ABGR32: case V4L2_PIX_FMT_GREY: + case V4L2_PIX_FMT_Y16: default: shader_RGB(m_frameFormat); break; @@ -588,6 +590,7 @@ void CaptureWinGLEngine::paintGL() break; case V4L2_PIX_FMT_GREY: + case V4L2_PIX_FMT_Y16: case V4L2_PIX_FMT_RGB332: case V4L2_PIX_FMT_BGR666: case V4L2_PIX_FMT_RGB555: @@ -1519,6 +1522,10 @@ void CaptureWinGLEngine::shader_RGB(__u32 format) glTexImage2D(GL_TEXTURE_2D, 0, internalFmt, m_frameWidth, m_frameHeight, 0, GL_LUMINANCE, GL_UNSIGNED_BYTE, NULL); break; + case V4L2_PIX_FMT_Y16: + internalFmt = manualTransform ? GL_LUMINANCE : GL_SLUMINANCE; + glTexImage2D(GL_TEXTURE_2D, 0, internalFmt, m_frameWidth, m_frameHeight, 0, + GL_LUMINANCE, GL_UNSIGNED_SHORT, NULL); case V4L2_PIX_FMT_RGB24: case V4L2_PIX_FMT_BGR24: default: @@ -1617,6 +1624,11 @@ void CaptureWinGLEngine::render_RGB(__u32 format) GL_LUMINANCE, GL_UNSIGNED_BYTE, m_frameData); break; + case V4L2_PIX_FMT_Y16: + glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, m_frameWidth, m_frameHeight, + GL_LUMINANCE, GL_UNSIGNED_SHORT, m_frameData); + break; + case V4L2_PIX_FMT_RGB555X: case V4L2_PIX_FMT_XRGB555X: case V4L2_PIX_FMT_ARGB555X: _______________________________________________ linuxtv-commits mailing list [email protected] http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
