7.0.050

metartc · Sep 6, 2023 · c3857c5 · c3857c5
1 parent e2fd1e6
commit c3857c5
Show file tree

Hide file tree

Showing 106 changed files with 222 additions and 818 deletions.
diff --git a/demo/metaplayer7/mainwindow.cpp b/demo/metaplayer7/mainwindow.cpp
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2019-2022 yanggaofeng
+// Copyright (c) 2019-2023 yanggaofeng
 //
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
@@ -20,7 +20,7 @@ MainWindow::MainWindow(QWidget *parent)
     m_centerWdiget->setLayout(m_vb);
     m_vb->setMargin(0);
     m_vb->setSpacing(0);
-#if defined (__APPLE__)
+#if Yang_OS_APPLE
      m_videoWin=new YangYuvPlayWidget(this);
 #else
      m_videoWin=new YangPlayWidget(this);

diff --git a/demo/metaplayer7/mainwindow.h b/demo/metaplayer7/mainwindow.h
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2019-2022 yanggaofeng
+// Copyright (c) 2019-2023 yanggaofeng
 //
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
@@ -28,7 +28,7 @@ class MainWindow : public QMainWindow,public YangSysMessageI
     ~MainWindow();
     YangRecordThread *m_videoThread;
     YangPlayerHandle *m_player;
-#if defined (__APPLE__)
+#if Yang_OS_APPLE
     YangYuvPlayWidget *m_videoWin;
 #else
     YangPlayWidget *m_videoWin;
@@ -55,9 +55,6 @@ void on_m_c_whep_clicked();
 private:
     Ui::MainWindow *ui;
 
-    //std::string serverIp,app,stream;
-   // std::string localServer;
-    //int localPort;
     QWidget *m_centerWdiget;
     QVBoxLayout *m_vb;
     QHBoxLayout *m_hb1;

diff --git a/demo/metaplayer7/video/yangrecordthread.h b/demo/metaplayer7/video/yangrecordthread.h
@@ -21,7 +21,7 @@ class YangRecordThread : public QThread
     void initPara();
 
 
-#if defined (__APPLE__)
+#if Yang_OS_APPLE
     YangYuvPlayWidget *m_video;
 #else
     YangPlayWidget *m_video;

diff --git a/demo/metaplayer7/yangplayer/YangPlayFactory.cpp b/demo/metaplayer7/yangplayer/YangPlayFactory.cpp
@@ -16,14 +16,14 @@ YangPlayFactory::~YangPlayFactory() {
 }
 
 YangAudioPlay* YangPlayFactory::createAudioPlay(YangAudioInfo *pcontext){
-#ifndef _WIN32
+#if !Yang_OS_WIN
 	return NULL;//if(pcontext->audioPlayType==1) return new YangAudioPlayAlsa(pcontext);
 #endif
 	return NULL;// new YangAudioPlaySdl(pcontext);
 }
 
 YangAudioPlay *YangPlayFactory::createAudioPlay(YangAudioPlayType paet,YangAudioInfo *pcontext){
-#ifndef _WIN32
+#if !Yang_OS_WIN
 	return NULL;//if(paet==Yang_AP_ALSA) return new YangAudioPlayAlsa(pcontext);
 #endif
 	return NULL;//new YangAudioPlaySdl(pcontext);

diff --git a/demo/metaplayer7/yangplayer/YangPlayerPlay.cpp b/demo/metaplayer7/yangplayer/YangPlayerPlay.cpp
@@ -25,13 +25,13 @@ void YangPlayerPlay::stopAll(){
 void YangPlayerPlay::initAudioPlay(YangContext* paudio){
 
 	if (m_audioPlay == NULL) {
-#ifdef _WIN32
+#if Yang_OS_WIN
     m_audioPlay = new YangWinAudioApiRender(&paudio->avinfo,&paudio->synMgr);
 #else
-#ifdef __ANDROID__
+#if Yang_OS_ANDROID
     m_audioPlay = new YangAudioPlayAndroid(&paudio->avinfo,&paudio->synMgr);
 #else
-        #if defined(__APPLE__)
+        #if Yang_OS_APPLE
             m_audioPlay = new YangAudioPlayMac(&paudio->avinfo,&paudio->synMgr);
         #else
             m_audioPlay = new YangAudioPlayLinux(&paudio->avinfo,&paudio->synMgr);

diff --git a/demo/metapushstream7/recordmainwindow.cpp b/demo/metapushstream7/recordmainwindow.cpp
@@ -56,7 +56,7 @@ RecordMainWindow::RecordMainWindow(QWidget *parent)
     m_hb0=new QHBoxLayout();
     ui->vdMain->setLayout(m_hb0);
 
-#if defined (__APPLE__)
+#if Yang_OS_APPLE
      m_win0=new YangYuvPlayWidget(this);
 #else
      m_win0=new YangPlayWidget(this);
@@ -92,7 +92,7 @@ RecordMainWindow::RecordMainWindow(QWidget *parent)
     //srs do not use audio fec
     m_context->avinfo.audio.enableAudioFec=yangfalse;
 
-#if defined (__APPLE__)
+#if Yang_OS_APPLE
     m_context->avinfo.video.videoCaptureFormat=YangNv12;
 #endif
 

diff --git a/demo/metapushstream7/recordmainwindow.h b/demo/metapushstream7/recordmainwindow.h
@@ -7,15 +7,12 @@
 #include <QMainWindow>
 #include <QHBoxLayout>
 
-
 #include <video/yangrecordthread.h>
 #include <video/yangrecordvideowin.h>
 #include <video/YangPlayWidget.h>
 #include <video/YangYuvPlayWidget.h>
 #include <yangutil/yangavinfotype.h>
-//#include <yangpush/YangPushHandle.h>
 #include <yangutil/sys/YangSysMessageI.h>
-//#include <yangutil/sys/YangWindowsMouse.h>
 #include <yangutil/sys/YangSysMessageHandle.h>
 #include <yangpush/YangPushFactory.h>
 #include "yangjanus.h"
@@ -35,7 +32,7 @@ class RecordMainWindow : public QMainWindow,public YangSysMessageI,public YangSy
     YangContext *m_context;
     YangRecordThread* m_rt;
 
-#if defined (__APPLE__)
+#if Yang_OS_APPLE
     YangYuvPlayWidget *m_win0;
 #else
     YangPlayWidget *m_win0;

diff --git a/demo/metapushstream7/video/yangrecordthread.h b/demo/metapushstream7/video/yangrecordthread.h
@@ -20,7 +20,7 @@ class YangRecordThread : public QThread
      int32_t m_isLoop;
     void initPara(YangContext *par);
 
-#if defined (__APPLE__)
+#if Yang_OS_APPLE
     YangYuvPlayWidget *m_video;
 #else
     YangPlayWidget *m_video;

diff --git a/include/yang_config.h b/include/yang_config.h
@@ -5,11 +5,13 @@
 #ifndef INCLUDE_YANG_CONFIG_H_
 #define INCLUDE_YANG_CONFIG_H_
 
+#include "yang_config_os.h"
+
 #define Yang_Enable_Datachannel 1
 #define Yang_Enable_Openh264    1
 #define Yang_Enable_Json        1
 
-#if _WIN32
+#if Yang_OS_WIN
 #define Yang_Enable_Openssl 1
 #define Yang_Enable_GPU_Encoding 0
 #define Yang_Enable_Phtread 0
@@ -37,13 +39,13 @@
 #define Yang_Enable_Dtls 1 //default:using dtls
 #define Yang_Enable_TWCC 0
 
-#ifdef _WIN32
+#if Yang_OS_WIN
 #define Yang_Enable_H264Decoder 0
 #define Yang_Enable_H264Decoder_So 1
 #define Yang_Enable_FfmpegSo 0
 #else
 #define Yang_Enable_H264Decoder 1
-#ifndef __ANDROID__
+#if !Yang_OS_ANDROID
 #define Yang_Enable_H264Decoder_So 0
 #else
 #define Yang_Enable_H264Decoder_So 0

diff --git a/include/yang_config_os.h b/include/yang_config_os.h
@@ -0,0 +1,42 @@
+//
+// Copyright (c) 2019-2023 yanggaofeng
+//
+
+#ifndef INCLUDE_YANG_CONFIG_OS_H_
+#define INCLUDE_YANG_CONFIG_OS_H_
+
+#if _WIN32
+	#define 	Yang_OS_WIN       1
+#else
+	#define 	Yang_OS_WIN       0
+#endif
+
+#ifdef __ANDROID__
+	#define 	Yang_OS_ANDROID     1
+#else
+	#define 	Yang_OS_ANDROID     0
+#endif
+
+#ifdef __APPLE__
+	#include <TargetConditionals.h>
+	#if defined(TARGET_OS_OSX)
+	#define 	Yang_OS_MAC       1
+	#define 	Yang_OS_IOS       0
+	#elif TARGET_OS_IPHONE
+	#define 	Yang_OS_MAC       0
+	#define 	Yang_OS_IOS       1
+	#endif
+	#define Yang_OS_APPLE         1
+#else
+	#define     Yang_OS_APPLE     0
+	#define 	Yang_OS_MAC       0
+	#define 	Yang_OS_IOS       0
+#endif
+
+#if defined(__linux__) && !Yang_OS_ANDROID
+	#define 	Yang_OS_LINUX     1
+#else
+	#define 	Yang_OS_LINUX     0
+#endif
+
+#endif /* INCLUDE_YANG_CONFIG_OS_H_ */
diff --git a/include/yangavutil/video/YangYuvConvert.h b/include/yangavutil/video/YangYuvConvert.h
@@ -15,7 +15,7 @@ extern "C"{
 #endif
 using namespace libyuv;
 
-#ifdef __ANDROID__
+#if Yang_OS_ANDROID
 #define Yang_Enable_YuvSo 0
 #else
 #define Yang_Enable_YuvSo 0

diff --git a/include/yangplayer/YangPlayerPlay.h b/include/yangplayer/YangPlayerPlay.h
@@ -28,14 +28,14 @@ class YangPlayerPlay {
 	void setInAudioList(YangAudioPlayBuffer *paudioList);
 	void stopAll();
 private:
-#ifdef _WIN32
+#if Yang_OS_WIN
         YangWinAudioApiRender *m_audioPlay;
 #else
 
-#ifdef __ANDROID__
+#if Yang_OS_ANDROID
         YangAudioPlayAndroid *m_audioPlay;
 #else
-    #if defined(__APPLE__)
+    #if Yang_OS_APPLE
         YangAudioPlayMac *m_audioPlay;
     #else
         YangAudioPlayLinux *m_audioPlay;

diff --git a/include/yangutil/sys/YangBits.h b/include/yangutil/sys/YangBits.h
@@ -4,7 +4,7 @@
 #ifndef INCLUDE_YANGUTIL_SYS_YANGBITS_H_
 #define INCLUDE_YANGUTIL_SYS_YANGBITS_H_
 #include <stdint.h>
-#ifdef _WIN32
+#if Yang_OS_WIN
 static __inline uint16_t
 uint16_identity (uint16_t __x)
 {

diff --git a/include/yangutil/sys/YangCTime.h b/include/yangutil/sys/YangCTime.h
@@ -17,7 +17,7 @@ int64_t yang_get_micro_time();//weimiao
 #define yang_get_micro_tick  yang_get_micro_time
 
 
-#ifdef _WIN32
+#if Yang_OS_WIN
 #include <winsock2.h>
 int gettimeofday(struct timeval *tp, void *tzp);
 #endif

diff --git a/include/yangutil/sys/YangCTimer.h b/include/yangutil/sys/YangCTimer.h
@@ -7,7 +7,7 @@
 #include <stdint.h>
 #include <yangutil/sys/YangThread.h>
 
-#if __APPLE__
+#if Yang_OS_APPLE
 	#include <dispatch/dispatch.h>
 
 #endif
@@ -23,11 +23,11 @@ typedef struct YangCTimer{
 	yang_thread_mutex_t t_lock;
 	yang_thread_cond_t t_cond_mess;
 #else
-    #ifdef _WIN32   
+    #if Yang_OS_WIN   
         HANDLE	hTimerQueue;
         HANDLE	hTimerQueueTimer;
         HANDLE  winEvent;
-	#elif __APPLE__
+	#elif Yang_OS_APPLE
 		dispatch_source_t _timer;
 	#else
         int32_t timerfd;

diff --git a/include/yangutil/sys/YangIni.h b/include/yangutil/sys/YangIni.h
@@ -4,7 +4,7 @@
 #ifndef __YangIni__H_
 #define __YangIni__H_
 #include <yangutil/yangavinfotype.h>
-#ifndef __ANDROID__
+#if !(Yang_OS_ANDROID || Yang_OS_IOS)
 
 typedef struct{
 	char* filename;

diff --git a/include/yangutil/sys/YangLoadLib.h b/include/yangutil/sys/YangLoadLib.h
@@ -5,7 +5,7 @@
 #ifndef YANGUTIL_SYS_YANGLOADLIB_H_
 #define YANGUTIL_SYS_YANGLOADLIB_H_
 #include <yangutil/yangtype.h>
-#ifdef _WIN32
+#if Yang_OS_WIN
 #include <minwindef.h>
 #endif
 class YangLoadLib{
@@ -18,7 +18,7 @@ void *loadSysObject(const char *sofile);
 void *loadFunction(const char *name);
 void unloadObject();
 
-#ifdef _WIN32
+#if Yang_OS_WIN
 HMODULE m_handle;
 char *dlerror();
 #else

diff --git a/include/yangutil/sys/YangLog.h b/include/yangutil/sys/YangLog.h
@@ -35,7 +35,7 @@ void yang_setCLogLevel(int32_t plevel);
 #endif
 
 
-#ifdef __ANDROID__
+#if Yang_OS_ANDROID
 #include <android/log.h>
 #define yang_fatal( fmt, ...) __android_log_print(ANDROID_LOG_FATAL,fmt, ##__VA_ARGS__)
 

diff --git a/include/yangutil/sys/YangSocket.h b/include/yangutil/sys/YangSocket.h
@@ -6,7 +6,7 @@
 #include <stdint.h>
 #include <yangutil/sys/YangVector.h>
 
-#ifdef _WIN32
+#if Yang_OS_WIN
 #include <winsock2.h>
 #include <ws2tcpip.h>
 #include <errno.h>
@@ -20,7 +20,7 @@
 #else
 #include <netinet/in.h>
 #include <errno.h>
-	#if __APPLE__
+	#if Yang_OS_APPLE
 		#include <TargetConditionals.h>
         #include <libkern/OSByteOrder.h>
         #define yang_be32toh OSSwapBigToHostInt32

diff --git a/include/yangutil/sys/YangThread.h b/include/yangutil/sys/YangThread.h
@@ -25,7 +25,7 @@
 #define yang_thread_cond_init pthread_cond_init
 #define yang_thread_cond_destroy pthread_cond_destroy
 #else
-	#if _WIN32
+	#if Yang_OS_WIN
 		#include <windows.h>
 
 		typedef HANDLE yang_thread_t;

diff --git a/include/yangutil/sys/YangTimer.h b/include/yangutil/sys/YangTimer.h
@@ -8,7 +8,7 @@
 #include <yangutil/yangtype.h>
 
 #if !Yang_Enable_Timer_Phtread
-#ifdef _WIN32
+#if Yang_OS_WIN
 #include <windows.h>
 #endif
 #endif
@@ -38,7 +38,7 @@ class YangTimer: public YangThread {
 	void stop();
 
 #if !Yang_Enable_Timer_Phtread
-#ifdef _WIN32
+#if Yang_OS_WIN
 	static void  CALLBACK TimeEvent(PVOID lpParam, BOOLEAN TimerOrWaitFired);
 #endif
 #endif
@@ -57,7 +57,7 @@ class YangTimer: public YangThread {
     yang_thread_mutex_t m_lock;
     yang_thread_cond_t m_cond_mess;
 #else
-#ifdef _WIN32
+#if Yang_OS_WIN
         void startWindowsEventTime(int pwaitTime,DWORD_PTR duser);
 	HANDLE	m_hTimerQueue;
 	HANDLE	m_hTimerQueueTimer;

diff --git a/include/yangutil/sys/YangYuvGl.h b/include/yangutil/sys/YangYuvGl.h
@@ -5,7 +5,7 @@
 #ifndef INCLUDE_YANGUTIL_SYS_YANGYUVGL_H_
 #define INCLUDE_YANGUTIL_SYS_YANGYUVGL_H_
 #include <yangutil/yangtype.h>
-#ifdef __ANDROID__
+#if Yang_OS_ANDROID
 #include <EGL/egl.h>
 #include <GLES2/gl2.h>
 

diff --git a/include/yangutil/yangavinfotype.h b/include/yangutil/yangavinfotype.h
@@ -131,7 +131,7 @@ class YangContext {
 	YangRtcCallback rtcCallback;
 	YangSendRtcMessage sendRtcMessage;
 
-#ifdef __ANDROID__
+#if Yang_OS_ANDROID
 	void* nativeWindow;
 #endif
 

diff --git a/libmetartc7/metartc7.pro b/libmetartc7/metartc7.pro
@@ -85,7 +85,6 @@ SOURCES += \
     src/yangcapture/linux/YangVideoCaptureLinux.cpp \
     src/yangcapture/win/YangDXGIManager.cpp \
     src/yangcapture/win/YangVideoCaptureWindows.cpp \
-    src/yangcapture/win/YangVideoSrc.cpp \
     src/yangcapture/win/YangWinVideoCaptureHandle.cpp \
     src/yangdecoder/YangAudioDecoder.cpp \
     src/yangdecoder/YangAudioDecoderHandle.cpp \