qv4l2: moved frame/rate count assignment to common class

Ongoing work to move aspect/crop/scale calculations from individual render
classes to the common capture-win class. Currently different renderers use
slightly different code to calculate the various cropping/scaling/etc. data.
This makes it hard to maintain.

Signed-off-by: Ove Brynestad <ovebryne@cisco.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>

diff --git a/utils/qv4l2/capture-win-gl.cpp b/utils/qv4l2/capture-win-gl.cpp
index 4d9be57..49ebc9c 100644 (file)
--- a/utils/qv4l2/capture-win-gl.cpp
+++ b/utils/qv4l2/capture-win-gl.cpp
@@ -66,7 +66,6 @@ void CaptureWinGL::setRenderFrame()
                                m_frameInfo.planeData[0],
                                m_frameInfo.planeData[1]);
 #endif
-       m_information.setText(m_frameInfo.info);
 }
 
 bool CaptureWinGL::hasNativeFormat(__u32 format)

diff --git a/utils/qv4l2/capture-win-qt.cpp b/utils/qv4l2/capture-win-qt.cpp
index 858ed53..eb1a0c4 100644 (file)
--- a/utils/qv4l2/capture-win-qt.cpp
+++ b/utils/qv4l2/capture-win-qt.cpp
@@ -67,7 +67,6 @@ void CaptureWinQt::setRenderFrame()
                CaptureWin::resizeScaleCrop();
        }
 
-       m_information.setText(m_frameInfo.info);
        paintFrame();
 }
 

diff --git a/utils/qv4l2/capture-win.cpp b/utils/qv4l2/capture-win.cpp
index 04aa6e8..ad769bc 100644 (file)
--- a/utils/qv4l2/capture-win.cpp
+++ b/utils/qv4l2/capture-win.cpp
@@ -79,6 +79,8 @@ void CaptureWin::setFrame(int width, int height, __u32 format,
         m_frameInfo.planeData[1] = data2;
         m_frameInfo.info        = info;
 
+       m_information.setText(m_frameInfo.info);
+
        setRenderFrame();
 }