7.0.023

metartc · Aug 11, 2023 · 3b12e70 · 3b12e70
1 parent 0df0d55
commit 3b12e70
Show file tree

Hide file tree

Showing 19 changed files with 811 additions and 213 deletions.
diff --git a/demo/metaplayer7/main.cpp b/demo/metaplayer7/main.cpp
@@ -7,6 +7,12 @@
 
 int main(int argc, char *argv[])
 {
+#if defined (__APPLE__)
+    QSurfaceFormat format;
+    format.setVersion(4,1);
+    format.setProfile(QSurfaceFormat::CoreProfile);
+   QSurfaceFormat::setDefaultFormat(format);
+#endif
     QApplication a(argc, argv);
     MainWindow w;
     YangRecordThread videoThread;

diff --git a/demo/metaplayer7/mainwindow.cpp b/demo/metaplayer7/mainwindow.cpp
@@ -20,8 +20,12 @@ MainWindow::MainWindow(QWidget *parent)
     m_centerWdiget->setLayout(m_vb);
     m_vb->setMargin(0);
     m_vb->setSpacing(0);
+#if defined (__APPLE__)
+     m_videoWin=new YangYuvPlayWidget(this);
+#else
+     m_videoWin=new YangPlayWidget(this);
+#endif
 
-    m_videoWin=new YangPlayWidget(this);
 
 
     m_hb1=new QHBoxLayout();
@@ -32,6 +36,7 @@ MainWindow::MainWindow(QWidget *parent)
     m_hb1->addWidget(ui->m_c_whep);
 
     m_hb2->addWidget(m_videoWin);
+
     m_vb->addLayout(m_hb1);
     m_vb->addLayout(m_hb2);
     m_vb->setStretchFactor(m_hb1,1);
@@ -98,8 +103,8 @@ void MainWindow::initVideoThread(YangRecordThread *prt){
     m_videoThread->m_video=m_videoWin;
     m_videoThread->initPara();
      m_videoThread->m_syn= m_context->synMgr.session->playBuffer;
-     m_videoWin->resize(700,500);
-    qDebug()<<"win width=="<<m_videoWin->width()<<" height="<<m_videoWin->height();
+
+
 }
 
 void MainWindow::on_m_b_play_clicked()

diff --git a/demo/metaplayer7/mainwindow.h b/demo/metaplayer7/mainwindow.h
@@ -11,6 +11,7 @@
 #include "yangplayer/YangPlayerHandle.h"
 #include "yangstream/YangStreamType.h"
 #include "yangplayer/YangPlayWidget.h"
+#include "yangplayer/YangYuvPlayWidget.h"
 #include <yangutil/yangavinfotype.h>
 #include <yangutil/sys/YangSysMessageI.h>
 
@@ -27,8 +28,11 @@ class MainWindow : public QMainWindow,public YangSysMessageI
     ~MainWindow();
     YangRecordThread *m_videoThread;
     YangPlayerHandle *m_player;
-
+#if defined (__APPLE__)
+    YangYuvPlayWidget *m_videoWin;
+#else
     YangPlayWidget *m_videoWin;
+#endif
 
     YangStreamConfig m_conf;
     void initVideoThread(YangRecordThread *prt);

diff --git a/demo/metaplayer7/metaplayer7.pro b/demo/metaplayer7/metaplayer7.pro
@@ -2,6 +2,7 @@ QT       += core gui
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
+
 CONFIG += c++11
 
 
@@ -105,15 +106,17 @@ SOURCES += \
     yangplayer/YangPlayerDecoder.cpp \
     yangplayer/YangPlayerHandleImpl.cpp \
     yangplayer/YangPlayerPlay.cpp \
-    yangplayer/YangRtcReceive.cpp
+    yangplayer/YangRtcReceive.cpp \
+    yangplayer/YangYuvPlayWidget.cpp
 
 
 HEADERS += \
     mainwindow.h \
     video/yangrecordthread.h \
     yangplayer/YangPlayWidget.h \
     yangplayer/YangPlayerHandleImpl.h \
-    yangplayer/YangRtcReceive.h
+    yangplayer/YangRtcReceive.h \
+    yangplayer/YangYuvPlayWidget.h
 
 
 FORMS += \

diff --git a/demo/metaplayer7/video/yangrecordthread.h b/demo/metaplayer7/video/yangrecordthread.h
@@ -7,8 +7,8 @@
 #include <QVector>
 
 #include <yangutil/buffer/YangVideoBuffer.h>
+#include <yangplayer/YangYuvPlayWidget.h>
 #include <yangplayer/YangPlayWidget.h>
-
 #include <yangstream/YangSynBuffer.h>
 
 class YangRecordThread : public QThread
@@ -20,8 +20,12 @@ class YangRecordThread : public QThread
     int m_isLoop;
     void initPara();
 
-    YangPlayWidget *m_video;
 
+#if defined (__APPLE__)
+    YangYuvPlayWidget *m_video;
+#else
+    YangPlayWidget *m_video;
+#endif
 
     YangSynBuffer* m_syn;
     bool m_isRender;