V59 for win32.

qiniu · Jan 3, 2018 · b5b09e5 · b5b09e5
1 parent 1976599
commit b5b09e5
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 1 deletion.
diff --git a/win32/SamplePlayer/bin/QPlayEng.Dll b/win32/SamplePlayer/bin/QPlayEng.Dll
diff --git a/win32/SamplePlayer/bin/TestCode.exe b/win32/SamplePlayer/bin/TestCode.exe
diff --git a/win32/SamplePlayer/bin/qcCodec.dll b/win32/SamplePlayer/bin/qcCodec.dll
diff --git a/win32/SamplePlayer/include/qcData.h b/win32/SamplePlayer/include/qcData.h
@@ -251,6 +251,8 @@ typedef struct
 	QCVideoType			nType;			/*!< Video buffer type */
 	int					nWidth;			/*!< Video width*/
 	int					nHeight;		/*!< Video height*/
+	int					nRatioNum;		///< Numerator
+	int					nRatioDen;		///< Denominator
 } QC_VIDEO_BUFF;
 
 

diff --git a/win32/SamplePlayer/include/qcDef.h b/win32/SamplePlayer/include/qcDef.h
@@ -25,6 +25,7 @@
 #define QC_MOD_IO_FILE					0x41100000
 #define QC_MOD_IO_HTTP					0x41200000
 #define QC_MOD_IO_RTMP					0x41300000
+#define QC_MOD_IO_RTSP					0x41400000
 
 #define QC_MOD_PARSER_MP4				0x42100000
 #define QC_MOD_PARSER_FLV				0x42200000

diff --git a/win32/SamplePlayer/include/qcIO.h b/win32/SamplePlayer/include/qcIO.h
@@ -46,6 +46,10 @@ extern "C" {
 // The parameter should be char *. 
 #define	QCIO_PID_HTTP_HeadHost			QC_MOD_IO_HTTP + 0X01
 
+// Get HTTP content type
+// The parameter should be char **.
+#define QCIO_PID_HTTP_CONTENT_TYPE		QC_MOD_IO_HTTP + 0X02
+
 // Set the ext lib file name
 // The parameter should be char *. 
 #define	QCIO_PID_EXT_LibName			QC_MOD_IO_BASE + 0X02
@@ -58,6 +62,9 @@ extern "C" {
 // The parameter should be long long *.
 #define QCIO_PID_RTMP_VIDEO_MSG_TIMESTAMP     QC_MOD_IO_RTMP + 0X02
 
+// Set RTSP tcp or upd  0 UPD, 1 TCP
+// The parameter should be int *.
+#define QCIO_PID_RTSP_UDP_TCP_MODE			  QC_MOD_IO_RTSP + 0X01
 
 // the IO source type
 typedef enum {
@@ -66,6 +73,7 @@ typedef enum {
     QC_IOTYPE_HTTP_VOD,
     QC_IOTYPE_HTTP_LIVE,
     QC_IOTYPE_RTMP,
+	QC_IOTYPE_RTSP,
 	QC_IOTYPE_EXTLIB,
 	QC_IOTYPE_MAX		= 0X7FFFFFFF
 }QCIOType;

diff --git a/win32/SamplePlayer/include/qcPlayer.h b/win32/SamplePlayer/include/qcPlayer.h
@@ -159,6 +159,10 @@ typedef struct
 // This should be called before open.
 #define	QCPLAY_PID_PD_Save_Path		QC_PLAY_BASE + 0X61
 
+// Set the PD save file ext name. Param should char *
+// This should be called before open.
+#define	QCPLAY_PID_PD_Save_ExtName	QC_PLAY_BASE + 0X62
+
 // Background color for video render. Param should  QC_COLOR *
 // This should be called before open. Default value is black, {0.0, 0.0, 0.0, 1.0}
 #define	QCPLAY_PID_BG_COLOR			QC_PLAY_BASE + 0X71
@@ -174,7 +178,11 @@ typedef struct
 // Get RTMP video message timestamp
 // The parameter should be long long *.
 #define QCPLAY_PID_RTMP_VIDEO_MSG_TIMESTAMP     QC_PLAY_BASE + 0X74
-
+
+// Get RTSP udp tcp mode. 0 UDP, 1 TCP
+// The parameter should be int *.
+#define QCPLAY_PID_RTSP_UDPTCP_MODE			    QC_PLAY_BASE + 0X81
+
 // Set ext audio render. Internal use.
 // The parameter should be CBaseAudioRnd *.
 #define	QCPLAY_PID_EXT_AudioRnd		QC_PLAY_BASE + 0X0100