From dcb775c6e88c01df5130dc4b70089ce010480606 Mon Sep 17 00:00:00 2001
From: hejilin <1724010622@qq.com>
Date: Thu, 16 Sep 2021 16:00:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E9=9D=9E=E7=AC=AC=E4=B8=89?=
 =?UTF-8?q?=E6=96=B9=E5=BA=93=E7=9A=84=E7=BC=96=E8=AF=91=E5=91=8A=E8=AD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/include/mk_media.h    |  8 ++++----
 api/source/mk_media.cpp   | 16 ++++++++--------
 player/AudioSRC.cpp       |  4 ++--
 player/FFMpegDecoder.cpp  |  2 +-
 src/Extension/SPSParser.c |  4 +---
 5 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/api/include/mk_media.h b/api/include/mk_media.h
index ad0b4783..39de4806 100755
--- a/api/include/mk_media.h
+++ b/api/include/mk_media.h
@@ -75,7 +75,7 @@ API_EXPORT void API_CALL mk_media_init_complete(mk_media ctx);
  * @param dts 解码时间戳，单位毫秒
  * @param pts 播放时间戳，单位毫秒
  */
-API_EXPORT void API_CALL mk_media_input_h264(mk_media ctx, void *data, int len, uint32_t dts, uint32_t pts);
+API_EXPORT void API_CALL mk_media_input_h264(mk_media ctx, const void *data, int len, uint32_t dts, uint32_t pts);
 
 /**
  * 输入单帧H265视频，帧起始字节00 00 01,00 00 00 01均可
@@ -85,7 +85,7 @@ API_EXPORT void API_CALL mk_media_input_h264(mk_media ctx, void *data, int len,
  * @param dts 解码时间戳，单位毫秒
  * @param pts 播放时间戳，单位毫秒
  */
-API_EXPORT void API_CALL mk_media_input_h265(mk_media ctx, void *data, int len, uint32_t dts, uint32_t pts);
+API_EXPORT void API_CALL mk_media_input_h265(mk_media ctx, const void *data, int len, uint32_t dts, uint32_t pts);
 
 /**
  * 输入单帧AAC音频(单独指定adts头)
@@ -95,7 +95,7 @@ API_EXPORT void API_CALL mk_media_input_h265(mk_media ctx, void *data, int len,
  * @param dts 时间戳，毫秒
  * @param adts adts头，可以为null
  */
-API_EXPORT void API_CALL mk_media_input_aac(mk_media ctx, void *data, int len, uint32_t dts, void *adts);
+API_EXPORT void API_CALL mk_media_input_aac(mk_media ctx, const void *data, int len, uint32_t dts, void *adts);
 
 /**
  * 输入单帧PCM音频,启用ENABLE_FAAC编译时，该函数才有效
@@ -113,7 +113,7 @@ API_EXPORT void API_CALL mk_media_input_pcm(mk_media ctx, void *data, int len, u
  * @param len  单帧音频数据字节数
  * @param dts 时间戳，毫秒
  */
-API_EXPORT void API_CALL mk_media_input_audio(mk_media ctx, void* data, int len, uint32_t dts);
+API_EXPORT void API_CALL mk_media_input_audio(mk_media ctx, const void* data, int len, uint32_t dts);
 
 /**
  * MediaSource.close()回调事件
diff --git a/api/source/mk_media.cpp b/api/source/mk_media.cpp
index f0031315..74bf40cd 100755
--- a/api/source/mk_media.cpp
+++ b/api/source/mk_media.cpp
@@ -202,22 +202,22 @@ API_EXPORT void API_CALL mk_media_init_complete(mk_media ctx){
     (*obj)->getChannel()->addTrackCompleted();
 }
 
-API_EXPORT void API_CALL mk_media_input_h264(mk_media ctx, void *data, int len, uint32_t dts, uint32_t pts) {
+API_EXPORT void API_CALL mk_media_input_h264(mk_media ctx, const void *data, int len, uint32_t dts, uint32_t pts) {
     assert(ctx && data && len > 0);
     MediaHelper::Ptr *obj = (MediaHelper::Ptr *) ctx;
-    (*obj)->getChannel()->inputH264((char *) data, len, dts, pts);
+    (*obj)->getChannel()->inputH264((const char *) data, len, dts, pts);
 }
 
-API_EXPORT void API_CALL mk_media_input_h265(mk_media ctx, void *data, int len, uint32_t dts, uint32_t pts) {
+API_EXPORT void API_CALL mk_media_input_h265(mk_media ctx, const void *data, int len, uint32_t dts, uint32_t pts) {
     assert(ctx && data && len > 0);
     MediaHelper::Ptr *obj = (MediaHelper::Ptr *) ctx;
-    (*obj)->getChannel()->inputH265((char *) data, len, dts, pts);
+    (*obj)->getChannel()->inputH265((const char *) data, len, dts, pts);
 }
 
-API_EXPORT void API_CALL mk_media_input_aac(mk_media ctx, void *data, int len, uint32_t dts, void *adts) {
+API_EXPORT void API_CALL mk_media_input_aac(mk_media ctx, const void *data, int len, uint32_t dts, void *adts) {
     assert(ctx && data && len > 0 && adts);
     MediaHelper::Ptr *obj = (MediaHelper::Ptr *) ctx;
-    (*obj)->getChannel()->inputAAC((char *) data, len, dts, (char *) adts);
+    (*obj)->getChannel()->inputAAC((const char *) data, len, dts, (char *) adts);
 }
 
 API_EXPORT void API_CALL mk_media_input_pcm(mk_media ctx, void *data , int len, uint32_t pts){
@@ -226,10 +226,10 @@ API_EXPORT void API_CALL mk_media_input_pcm(mk_media ctx, void *data , int len,
 	(*obj)->getChannel()->inputPCM((char*)data, len, pts);
 }
 
-API_EXPORT void API_CALL mk_media_input_audio(mk_media ctx, void* data, int len, uint32_t dts){
+API_EXPORT void API_CALL mk_media_input_audio(mk_media ctx, const void* data, int len, uint32_t dts){
     assert(ctx && data && len > 0);
     MediaHelper::Ptr* obj = (MediaHelper::Ptr*) ctx;
-    (*obj)->getChannel()->inputAudio((char*)data, len, dts);
+    (*obj)->getChannel()->inputAudio((const char*)data, len, dts);
 }
 
 API_EXPORT void API_CALL mk_media_start_send_rtp(mk_media ctx, const char *dst_url, uint16_t dst_port, const char *ssrc, int is_udp, on_mk_media_send_rtp_result cb, void *user_data){
diff --git a/player/AudioSRC.cpp b/player/AudioSRC.cpp
index e39f9396..3c2255fa 100644
--- a/player/AudioSRC.cpp
+++ b/player/AudioSRC.cpp
@@ -83,7 +83,7 @@ int AudioSRC::getPCMData(char *buf, int size) {
     if (_audio_cvt.len_cvt) {
         _target_buf.append(_buf.get(), _audio_cvt.len_cvt);
     }
-    if (_target_buf.size() < size) {
+    if (_target_buf.size() < (size_t)size) {
         return 0;
     }
     memcpy(buf, _target_buf.data(), size);
@@ -122,7 +122,7 @@ int AudioPlayer::getPCMChannel() {
 
 int AudioPlayer::getPCMData(char *buf, int size) {
     lock_guard<mutex> lck(_mtx);
-    if (_buffer.size() < size) {
+    if (_buffer.size() < (size_t)size) {
         return 0;
     }
     memcpy(buf, _buffer.data(), size);
diff --git a/player/FFMpegDecoder.cpp b/player/FFMpegDecoder.cpp
index c85f80dd..fc6685bf 100644
--- a/player/FFMpegDecoder.cpp
+++ b/player/FFMpegDecoder.cpp
@@ -102,7 +102,7 @@ FFmpegSwr::~FFmpegSwr() {
 FFmpegFrame::Ptr FFmpegSwr::inputFrame(const FFmpegFrame::Ptr &frame) {
     if (frame->get()->format == _target_format &&
     frame->get()->channels == _target_channels &&
-    frame->get()->channel_layout == _target_channel_layout &&
+    frame->get()->channel_layout == (uint64_t)_target_channel_layout &&
     frame->get()->sample_rate == _target_samplerate) {
         //不转格式
         return frame;
diff --git a/src/Extension/SPSParser.c b/src/Extension/SPSParser.c
index 36c2aed7..ecd69862 100644
--- a/src/Extension/SPSParser.c
+++ b/src/Extension/SPSParser.c
@@ -712,7 +712,6 @@ static inline int decodeVuiParameters(void *pvBuf, T_SPS *ptSps)
 {
     int iAspectRatioInfoPresentFlag;
     unsigned int uiAspectRatioIdc;
-    int iChromaSampleLocation;
 
     iAspectRatioInfoPresentFlag = getOneBit(pvBuf);
 
@@ -759,8 +758,7 @@ static inline int decodeVuiParameters(void *pvBuf, T_SPS *ptSps)
     /* chroma_location_info_present_flag */
     if (getOneBit(pvBuf))
     {
-        /* chroma_sample_location_type_top_field */
-        iChromaSampleLocation = parseUe(pvBuf);
+        parseUe(pvBuf);  /* chroma_sample_location_type_top_field */
         parseUe(pvBuf);  /* chroma_sample_location_type_bottom_field */
     }
     if(getBitsLeft(pvBuf) < 10)