diff --git a/.gitignore b/.gitignore index 5f36ee4..b8df3a2 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ device/mpp/sample/venc/su.PR device/mpp/sample/venc/Makefile2 client/qt_gl_render/build-yuvgl-Qt_5_14_0_msvc2017_e7f4d0-Debug/ client/qt_gl_render/yuvgl/yuvgl.pro.user.ed68183.4.8-pre1 +client/qt_gl_render/build-yuvgl-Desktop_Qt_5_14_0_MinGW_32_bit-Debug/ diff --git a/client/qt_gl_render/yuvgl/cplaywidget.cpp b/client/qt_gl_render/yuvgl/cplaywidget.cpp index d80ebe0..4546073 100644 --- a/client/qt_gl_render/yuvgl/cplaywidget.cpp +++ b/client/qt_gl_render/yuvgl/cplaywidget.cpp @@ -1,8 +1,8 @@ -#include "CPlayWidget.h" #include #include #include +#include "CPlayWidget.h" void CPlayWidget::OnUpdateFrame() { @@ -49,7 +49,7 @@ void CPlayWidget::PlayOneFrame() } //申请内存存一帧yuv图像数据,其大小为分辨率的1.5倍 int nLen = m_nVideoW*m_nVideoH*3/2; - if(NULL == m_pBufYuv420p) + if(nullptr == m_pBufYuv420p) { m_pBufYuv420p = new unsigned char[nLen]; qDebug("CPlayWidget::PlayOneFrame new data memory. Len=%d width=%d height=%d\n", diff --git a/client/qt_gl_render/yuvgl/cplaywidget.h b/client/qt_gl_render/yuvgl/cplaywidget.h index 2be4f20..802495a 100644 --- a/client/qt_gl_render/yuvgl/cplaywidget.h +++ b/client/qt_gl_render/yuvgl/cplaywidget.h @@ -28,8 +28,8 @@ private: GLuint textureUniformY; //y纹理数据位置 GLuint textureUniformU; //u纹理数据位置 GLuint textureUniformV; //v纹理数据位置 - GLuint id_y; //y纹理对象ID - GLuint id_u; //u纹理对象ID + GLuint id_y; + GLuint id_u; GLuint id_v; //v纹理对象ID QOpenGLTexture* m_pTextureY; //y纹理对象 QOpenGLTexture* m_pTextureU; //u纹理对象 diff --git a/client/qt_gl_render/yuvgl/yuvgl.pro.user.4.10-pre1 b/client/qt_gl_render/yuvgl/yuvgl.pro.user.4.10-pre1 new file mode 100644 index 0000000..3b20586 --- /dev/null +++ b/client/qt_gl_render/yuvgl/yuvgl.pro.user.4.10-pre1 @@ -0,0 +1,598 @@ + + + + + + EnvironmentId + {bccf4b57-4470-414a-a840-fdad9939972c} + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + true + false + 0 + true + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + -fno-delayed-template-parsing + + true + + + + ProjectExplorer.Project.Target.0 + + Qt 5.14.0 (msvc2017) + Qt 5.14.0 (msvc2017) + {e7f4d0a4-ebba-4430-a5f7-020932213e78} + 0 + 0 + 0 + + D:/project/multimedia/client/qt_gl_render/build-yuvgl-Qt_5_14_0_msvc2017_e7f4d0-Debug + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + true + + + D:/project/multimedia/client/qt_gl_render/build-yuvgl-Qt_5_14_0_msvc2017_e7f4d0-Release + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + true + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + + D:/project/multimedia/client/qt_gl_render/build-yuvgl-Qt_5_14_0_msvc2017_e7f4d0-Profile + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + true + true + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 3 + + + 0 + 部署 + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deploy Configuration + + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + dwarf + + cpu-cycles + + + 250 + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + yuvgl + + Qt4ProjectManager.Qt4RunConfiguration:D:/project/multimedia/client/qt_gl_render/yuvgl/yuvgl.pro + + 3768 + false + true + true + false + false + true + + D:/project/multimedia/client/qt_gl_render/build-yuvgl-Qt_5_14_0_msvc2017_e7f4d0-Debug + + 1 + + + + ProjectExplorer.Project.Target.1 + + Qt 5.14.0 (msvc2017) + Qt 5.14.0 (msvc2017) + {64b425c2-38f7-4c05-8b08-ba417625d345} + 0 + 0 + 0 + + D:/project/multimedia/client/qt_gl_render/build-yuvgl-Qt_5_14_0_msvc2017_64b425-Debug + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + true + + + D:/project/multimedia/client/qt_gl_render/build-yuvgl-Qt_5_14_0_msvc2017_64b425-Release + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + true + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + + D:/project/multimedia/client/qt_gl_render/build-yuvgl-Qt_5_14_0_msvc2017_64b425-Profile + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + true + true + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 3 + + + 0 + 部署 + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deploy Configuration + + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + dwarf + + cpu-cycles + + + 250 + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + + Custom Executable + + ProjectExplorer.CustomExecutableRunConfiguration + + 3768 + false + true + false + false + true + + + + 1 + + + + ProjectExplorer.Project.TargetCount + 2 + + + ProjectExplorer.Project.Updater.FileVersion + 21 + + + Version + 21 + +