Merge branch 'master' of http://47.99.71.219:10086/apple/cplayer

CPlayer/Player/PlayerGLWidget.cpp

@@ -312,14 +312,23 @@ void PlayerGLWidget::paintGL()
     glActiveTexture(GL_TEXTURE0);
     glBindTexture(GL_TEXTURE_2D, textureIdY_);
     glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE, m_imageSize.width(), m_imageSize.height(), 0, GL_LUMINANCE, GL_UNSIGNED_BYTE, m_yData.data());
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glGenerateMipmap(GL_TEXTURE_2D);
 
     glActiveTexture(GL_TEXTURE1);
     glBindTexture(GL_TEXTURE_2D, textureIdU_);
     glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE, uvWidth, uvHeight, 0, GL_LUMINANCE, GL_UNSIGNED_BYTE, m_uData.data());
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glGenerateMipmap(GL_TEXTURE_2D);
 
     glActiveTexture(GL_TEXTURE2);
     glBindTexture(GL_TEXTURE_2D, textureIdV_);
     glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE, uvWidth, uvHeight, 0, GL_LUMINANCE, GL_UNSIGNED_BYTE, m_vData.data());
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glGenerateMipmap(GL_TEXTURE_2D);
 
     // 设置纹理单元
     glUniform1i(glGetUniformLocation(shaderProgram, "textureY"), 0);

show1/widget.cpp

@@ -134,17 +134,17 @@ void widget::initCameraPlayer()
 
     m_cameraPlayer3 = new CameraPlayer;
     m_cameraPlayer3->setImage(image);
-    m_cameraPlayer3->initCamera("192.1.2.73", 8000, "admin", "LH123456");
-    m_cameraPlayer3->startRealPlay(1);
-    m_cameraPlayer3->setPlayWndParent(ui->widget_display3);
-    m_cameraPlayer3->setPlayWndSize(ui->widget_display3->size());
+    // m_cameraPlayer3->initCamera("192.1.2.73", 8000, "admin", "LH123456");
+    // m_cameraPlayer3->startRealPlay(1);
+    // m_cameraPlayer3->setPlayWndParent(ui->widget_display3);
+    // m_cameraPlayer3->setPlayWndSize(ui->widget_display3->size());
 
     m_cameraPlayer4 = new CameraPlayer;
     m_cameraPlayer4->setImage(image);
-    m_cameraPlayer4->initCamera("192.1.2.73", 8000, "admin", "LH123456");
-    m_cameraPlayer4->startRealPlay(1);
-    m_cameraPlayer4->setPlayWndParent(ui->widget_display4);
-    m_cameraPlayer4->setPlayWndSize(ui->widget_display4->size());
+    // m_cameraPlayer4->initCamera("192.1.2.73", 8000, "admin", "LH123456");
+    // m_cameraPlayer4->startRealPlay(1);
+    // m_cameraPlayer4->setPlayWndParent(ui->widget_display4);
+    // m_cameraPlayer4->setPlayWndSize(ui->widget_display4->size());
 }