From 840287e8662fda331cf8e7aa4dbddb600aded2e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A6=E5=9B=BD=E5=BA=86?= <weiguoqing2@huawei.com>
Date: Thu, 27 Feb 2025 11:19:02 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=91=8A=E8=AD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 韦国庆 <weiguoqing2@huawei.com>
---
 .../av_receiver/src/av_receiver_engine.cpp    | 98 ++++++++++++++-----
 .../av_sender/src/av_sender_engine.cpp        | 98 ++++++++++++++-----
 av_transport/common/include/av_trans_utils.h  |  2 +
 av_transport/common/src/av_trans_utils.cpp    | 15 ++-
 4 files changed, 163 insertions(+), 50 deletions(-)

diff --git a/av_transport/av_trans_engine/av_receiver/src/av_receiver_engine.cpp b/av_transport/av_trans_engine/av_receiver/src/av_receiver_engine.cpp
index 029cb855..6bd2332a 100644
--- a/av_transport/av_trans_engine/av_receiver/src/av_receiver_engine.cpp
+++ b/av_transport/av_trans_engine/av_receiver/src/av_receiver_engine.cpp
@@ -351,8 +351,13 @@ void AVReceiverEngine::SetVideoWidth(const std::string &value)
         AVTRANS_LOGE("avInput_ is nullptr.");
         return;
     }
-    avInput_->SetParameter(static_cast<int32_t>(Plugin::Tag::VIDEO_WIDTH), std::stoi(value));
-    AVTRANS_LOGI("SetParameter VIDEO_WIDTH success, video width = %{public}s", value.c_str());
+    int intValue = 0;
+    if (convertToInt(value, intValue)) {
+        avInput_->SetParameter(static_cast<int32_t>(Plugin::Tag::VIDEO_WIDTH), intValue);
+        AVTRANS_LOGI("SetParameter VIDEO_WIDTH success, video width = %{public}s", value.c_str());
+    } else {
+        AVTRANS_LOGI("SetParameter VIDEO_WIDTH failed, value conversion failed.");
+    }
 }
 
 void AVReceiverEngine::SetVideoHeight(const std::string &value)
@@ -361,8 +366,13 @@ void AVReceiverEngine::SetVideoHeight(const std::string &value)
         AVTRANS_LOGE("avInput_ is nullptr.");
         return;
     }
-    avInput_->SetParameter(static_cast<int32_t>(Plugin::Tag::VIDEO_HEIGHT), std::stoi(value));
-    AVTRANS_LOGI("SetParameter VIDEO_HEIGHT success, video height = %{public}s", value.c_str());
+    int intValue = 0;
+    if (convertToInt(value, intValue)) {
+        avInput_->SetParameter(static_cast<int32_t>(Plugin::Tag::VIDEO_HEIGHT), intValue);
+        AVTRANS_LOGI("SetParameter VIDEO_HEIGHT success, video height = %{public}s", value.c_str());
+    } else {
+        AVTRANS_LOGI("SetParameter VIDEO_HEIGHT failed, value conversion failed.");
+    }
 }
 
 void AVReceiverEngine::SetVideoFrameRate(const std::string &value)
@@ -371,9 +381,14 @@ void AVReceiverEngine::SetVideoFrameRate(const std::string &value)
         AVTRANS_LOGE("avInput_ or avOutput_ is nullptr.");
         return;
     }
-    avInput_->SetParameter(static_cast<int32_t>(Plugin::Tag::VIDEO_FRAME_RATE), std::stoi(value));
-    avOutput_->SetParameter(static_cast<int32_t>(Plugin::Tag::VIDEO_FRAME_RATE), std::stoi(value));
-    AVTRANS_LOGI("SetParameter VIDEO_FRAME_RATE success, frame rate = %{public}s", value.c_str());
+    int intValue = 0;
+    if (convertToInt(value, intValue)) {
+        avInput_->SetParameter(static_cast<int32_t>(Plugin::Tag::VIDEO_FRAME_RATE), intValue);
+        avOutput_->SetParameter(static_cast<int32_t>(Plugin::Tag::VIDEO_FRAME_RATE), intValue);
+        AVTRANS_LOGI("SetParameter VIDEO_FRAME_RATE success, frame rate = %{public}s", value.c_str());
+    } else {
+        AVTRANS_LOGI("SetParameter VIDEO_FRAME_RATE failed, value conversion failed.");
+    }
 }
 
 void AVReceiverEngine::SetAudioBitRate(const std::string &value)
@@ -382,8 +397,13 @@ void AVReceiverEngine::SetAudioBitRate(const std::string &value)
         AVTRANS_LOGE("avInput_ is nullptr.");
         return;
     }
-    avInput_->SetParameter(static_cast<int32_t>(Plugin::Tag::MEDIA_BITRATE), std::stoi(value));
-    AVTRANS_LOGI("SetParameter MEDIA_BITRATE success, bit rate = %{public}s", value.c_str());
+    int intValue = 0;
+    if (convertToInt(value, intValue)) {
+        avInput_->SetParameter(static_cast<int32_t>(Plugin::Tag::MEDIA_BITRATE), intValue);
+        AVTRANS_LOGI("SetParameter MEDIA_BITRATE success, bit rate = %{public}s", value.c_str());
+    } else {
+        AVTRANS_LOGI("SetParameter MEDIA_BITRATE failed, value conversion failed.");
+    }
 }
 
 void AVReceiverEngine::SetVideoBitRate(const std::string &value)
@@ -392,8 +412,13 @@ void AVReceiverEngine::SetVideoBitRate(const std::string &value)
         AVTRANS_LOGE("avInput_ is nullptr.");
         return;
     }
-    avInput_->SetParameter(static_cast<int32_t>(Plugin::Tag::MEDIA_BITRATE), std::stoi(value));
-    AVTRANS_LOGI("SetParameter MEDIA_BITRATE success, bit rate = %{public}s", value.c_str());
+    int intValue = 0;
+    if (convertToInt(value, intValue)) {
+        avInput_->SetParameter(static_cast<int32_t>(Plugin::Tag::MEDIA_BITRATE), intValue);
+        AVTRANS_LOGI("SetParameter MEDIA_BITRATE success, bit rate = %{public}s", value.c_str());
+    } else {
+        AVTRANS_LOGI("SetParameter MEDIA_BITRATE failed, value conversion failed.");
+    }
 }
 
 void AVReceiverEngine::SetVideoCodecType(const std::string &value)
@@ -438,9 +463,14 @@ void AVReceiverEngine::SetAudioChannelMask(const std::string &value)
         AVTRANS_LOGE("avInput_ or avOutput_ is nullptr.");
         return;
     }
-    avInput_->SetParameter(static_cast<int32_t>(Plugin::Tag::AUDIO_CHANNELS), std::stoi(value));
-    avOutput_->SetParameter(static_cast<int32_t>(Plugin::Tag::AUDIO_CHANNELS), std::stoi(value));
-    AVTRANS_LOGI("SetParameter AUDIO_CHANNELS success, audio channels = %{public}s", value.c_str());
+    int intValue = 0;
+    if (convertToInt(value, intValue)) {
+        avInput_->SetParameter(static_cast<int32_t>(Plugin::Tag::AUDIO_CHANNELS), intValue);
+        avOutput_->SetParameter(static_cast<int32_t>(Plugin::Tag::AUDIO_CHANNELS), intValue);
+        AVTRANS_LOGI("SetParameter AUDIO_CHANNELS success, audio channels = %{public}s", value.c_str());
+    } else {
+        AVTRANS_LOGI("SetParameter AUDIO_CHANNEL_LAYOUT failed, value conversion failed.");
+    }
 }
 
 void AVReceiverEngine::SetAudioSampleRate(const std::string &value)
@@ -449,9 +479,14 @@ void AVReceiverEngine::SetAudioSampleRate(const std::string &value)
         AVTRANS_LOGE("avInput_ or avOutput_ is nullptr.");
         return;
     }
-    avInput_->SetParameter(static_cast<int32_t>(Plugin::Tag::AUDIO_SAMPLE_RATE), std::stoi(value));
-    avOutput_->SetParameter(static_cast<int32_t>(Plugin::Tag::AUDIO_SAMPLE_RATE), std::stoi(value));
-    AVTRANS_LOGI("SetParameter AUDIO_SAMPLE_RATE success, audio sample rate = %{public}s", value.c_str());
+    int intValue = 0;
+    if (convertToInt(value, intValue)) {
+        avInput_->SetParameter(static_cast<int32_t>(Plugin::Tag::AUDIO_SAMPLE_RATE), intValue);
+        avOutput_->SetParameter(static_cast<int32_t>(Plugin::Tag::AUDIO_SAMPLE_RATE), intValue);
+        AVTRANS_LOGI("SetParameter AUDIO_SAMPLE_RATE success, audio sample rate = %{public}s", value.c_str());
+    } else {
+        AVTRANS_LOGI("SetParameter AUDIO_SAMPLE_RATE failed, value conversion failed.");
+    }
 }
 
 void AVReceiverEngine::SetAudioChannelLayout(const std::string &value)
@@ -460,9 +495,14 @@ void AVReceiverEngine::SetAudioChannelLayout(const std::string &value)
         AVTRANS_LOGE("avInput_ or avOutput_ is nullptr.");
         return;
     }
-    avInput_->SetParameter(static_cast<int32_t>(Plugin::Tag::AUDIO_CHANNEL_LAYOUT), std::stoi(value));
-    avOutput_->SetParameter(static_cast<int32_t>(Plugin::Tag::AUDIO_CHANNEL_LAYOUT), std::stoi(value));
-    AVTRANS_LOGI("SetParameter AUDIO_CHANNEL_LAYOUT success, audio channel layout = %{public}s", value.c_str());
+    int intValue = 0;
+    if (convertToInt(value, intValue)) {
+        avInput_->SetParameter(static_cast<int32_t>(Plugin::Tag::AUDIO_CHANNEL_LAYOUT), intValue);
+        avOutput_->SetParameter(static_cast<int32_t>(Plugin::Tag::AUDIO_CHANNEL_LAYOUT), intValue);
+        AVTRANS_LOGI("SetParameter AUDIO_CHANNEL_LAYOUT success, audio channel layout = %{public}s", value.c_str());
+    } else {
+        AVTRANS_LOGI("SetParameter AUDIO_CHANNEL_LAYOUT failed, value conversion failed.");
+    }
 }
 
 void AVReceiverEngine::SetAudioSampleFormat(const std::string &value)
@@ -471,8 +511,13 @@ void AVReceiverEngine::SetAudioSampleFormat(const std::string &value)
         AVTRANS_LOGE("avInput_ is nullptr.");
         return;
     }
-    avInput_->SetParameter(static_cast<int32_t>(Plugin::Tag::AUDIO_SAMPLE_FORMAT), std::stoi(value));
-    AVTRANS_LOGI("SetParameter AUDIO_SAMPLE_FORMAT success, audio sample format = %{public}s", value.c_str());
+    int intValue = 0;
+    if (convertToInt(value, intValue)) {
+        avInput_->SetParameter(static_cast<int32_t>(Plugin::Tag::AUDIO_SAMPLE_FORMAT), intValue);
+        AVTRANS_LOGI("SetParameter AUDIO_SAMPLE_FORMAT success, audio sample format = %{public}s", value.c_str());
+    } else {
+        AVTRANS_LOGI("SetParameter AUDIO_SAMPLE_FORMAT failed, value conversion failed.");
+    }
 }
 
 void AVReceiverEngine::SetAudioFrameSize(const std::string &value)
@@ -481,8 +526,13 @@ void AVReceiverEngine::SetAudioFrameSize(const std::string &value)
         AVTRANS_LOGE("avInput_ is nullptr.");
         return;
     }
-    avInput_->SetParameter(static_cast<int32_t>(Plugin::Tag::AUDIO_SAMPLE_PER_FRAME), std::stoi(value));
-    AVTRANS_LOGI("SetParameter AUDIO_SAMPLE_PER_FRAME success, audio sample per frame = %{public}s", value.c_str());
+    int intValue = 0;
+    if (convertToInt(value, intValue)) {
+        avInput_->SetParameter(static_cast<int32_t>(Plugin::Tag::AUDIO_SAMPLE_PER_FRAME), intValue);
+        AVTRANS_LOGI("SetParameter AUDIO_SAMPLE_PER_FRAME success, audio sample per frame = %{public}s", value.c_str());
+    } else {
+        AVTRANS_LOGI("SetParameter AUDIO_SAMPLE_PER_FRAME failed, value conversion failed.");
+    }
 }
 
 void AVReceiverEngine::SetSyncResult(const std::string &value)
diff --git a/av_transport/av_trans_engine/av_sender/src/av_sender_engine.cpp b/av_transport/av_trans_engine/av_sender/src/av_sender_engine.cpp
index 69e4363d..ace6ce36 100644
--- a/av_transport/av_trans_engine/av_sender/src/av_sender_engine.cpp
+++ b/av_transport/av_trans_engine/av_sender/src/av_sender_engine.cpp
@@ -326,8 +326,13 @@ void AVSenderEngine::SetVideoWidth(const std::string &value)
         AVTRANS_LOGE("avInput_ is nullptr.");
         return;
     }
-    avInput_->SetParameter(static_cast<int32_t>(Plugin::Tag::VIDEO_WIDTH), std::stoi(value));
-    AVTRANS_LOGI("SetParameter VIDEO_WIDTH success, video width = %{public}s", value.c_str());
+    int intValue = 0;
+    if (convertToInt(value, intValue)) {
+        avInput_->SetParameter(static_cast<int32_t>(Plugin::Tag::VIDEO_WIDTH), intValue);
+        AVTRANS_LOGI("SetParameter VIDEO_WIDTH success, video width = %{public}s", value.c_str());
+    } else {
+        AVTRANS_LOGI("SetParameter VIDEO_WIDTH failed, value conversion failed.");
+    }
 }
 
 void AVSenderEngine::SetVideoHeight(const std::string &value)
@@ -336,8 +341,13 @@ void AVSenderEngine::SetVideoHeight(const std::string &value)
         AVTRANS_LOGE("avInput_ is nullptr.");
         return;
     }
-    avInput_->SetParameter(static_cast<int32_t>(Plugin::Tag::VIDEO_HEIGHT), std::stoi(value));
-    AVTRANS_LOGI("SetParameter VIDEO_HEIGHT success, video height = %{public}s", value.c_str());
+    int intValue = 0;
+    if (convertToInt(value, intValue)) {
+        avInput_->SetParameter(static_cast<int32_t>(Plugin::Tag::VIDEO_HEIGHT), intValue);
+        AVTRANS_LOGI("SetParameter VIDEO_HEIGHT success, video height = %{public}s", value.c_str());
+    } else {
+        AVTRANS_LOGI("SetParameter VIDEO_HEIGHT failed, value conversion failed.");
+    }
 }
 
 void AVSenderEngine::SetVideoPixelFormat(const std::string &value)
@@ -356,9 +366,14 @@ void AVSenderEngine::SetVideoFrameRate(const std::string &value)
         AVTRANS_LOGE("avInput_ or avOutput_ is nullptr.");
         return;
     }
-    avInput_->SetParameter(static_cast<int32_t>(Plugin::Tag::VIDEO_FRAME_RATE), std::stoi(value));
-    avOutput_->SetParameter(static_cast<int32_t>(Plugin::Tag::VIDEO_FRAME_RATE), std::stoi(value));
-    AVTRANS_LOGI("SetParameter VIDEO_FRAME_RATE success, frame rate = %{public}s", value.c_str());
+    int intValue = 0;
+    if (convertToInt(value, intValue)) {
+        avInput_->SetParameter(static_cast<int32_t>(Plugin::Tag::VIDEO_FRAME_RATE), intValue);
+        avOutput_->SetParameter(static_cast<int32_t>(Plugin::Tag::VIDEO_FRAME_RATE), intValue);
+        AVTRANS_LOGI("SetParameter VIDEO_FRAME_RATE success, frame rate = %{public}s", value.c_str());
+    } else {
+        AVTRANS_LOGI("SetParameter VIDEO_FRAME_RATE failed, value conversion failed.");
+    }
 }
 
 void AVSenderEngine::SetAudioBitRate(const std::string &value)
@@ -367,8 +382,13 @@ void AVSenderEngine::SetAudioBitRate(const std::string &value)
         AVTRANS_LOGE("avInput_ is nullptr.");
         return;
     }
-    avInput_->SetParameter(static_cast<int32_t>(Plugin::Tag::MEDIA_BITRATE), std::stoi(value));
-    AVTRANS_LOGI("SetParameter MEDIA_BITRATE success, bit rate = %{public}s", value.c_str());
+    int intValue = 0;
+    if (convertToInt(value, intValue)) {
+        avInput_->SetParameter(static_cast<int32_t>(Plugin::Tag::MEDIA_BITRATE), intValue);
+        AVTRANS_LOGI("SetParameter MEDIA_BITRATE success, bit rate = %{public}s", value.c_str());
+    } else {
+        AVTRANS_LOGI("SetParameter MEDIA_BITRATE failed, value conversion failed.");
+    }
 }
 
 void AVSenderEngine::SetVideoBitRate(const std::string &value)
@@ -377,8 +397,13 @@ void AVSenderEngine::SetVideoBitRate(const std::string &value)
         AVTRANS_LOGE("avInput_ is nullptr.");
         return;
     }
-    avInput_->SetParameter(static_cast<int32_t>(Plugin::Tag::MEDIA_BITRATE), std::stoi(value));
-    AVTRANS_LOGI("SetParameter MEDIA_BITRATE success, bit rate = %{public}s", value.c_str());
+    int intValue = 0;
+    if (convertToInt(value, intValue)) {
+        avInput_->SetParameter(static_cast<int32_t>(Plugin::Tag::MEDIA_BITRATE), intValue);
+        AVTRANS_LOGI("SetParameter MEDIA_BITRATE success, bit rate = %{public}s", value.c_str());
+    } else {
+        AVTRANS_LOGI("SetParameter MEDIA_BITRATE failed, value conversion failed.");
+    }
 }
 
 void AVSenderEngine::SetVideoCodecType(const std::string &value)
@@ -438,9 +463,14 @@ void AVSenderEngine::SetAudioChannelMask(const std::string &value)
         AVTRANS_LOGE("avInput_ or avOutput_ is nullptr.");
         return;
     }
-    avInput_->SetParameter(static_cast<int32_t>(Plugin::Tag::AUDIO_CHANNELS), std::stoi(value));
-    avOutput_->SetParameter(static_cast<int32_t>(Plugin::Tag::AUDIO_CHANNELS), std::stoi(value));
-    AVTRANS_LOGI("SetParameter AUDIO_CHANNELS success, audio channels = %{public}s", value.c_str());
+    int intValue = 0;
+    if (convertToInt(value, intValue)) {
+        avInput_->SetParameter(static_cast<int32_t>(Plugin::Tag::AUDIO_CHANNELS), intValue);
+        avOutput_->SetParameter(static_cast<int32_t>(Plugin::Tag::AUDIO_CHANNELS), intValue);
+        AVTRANS_LOGI("SetParameter AUDIO_CHANNELS success, audio channels = %{public}s", value.c_str());
+    } else {
+        AVTRANS_LOGI("SetParameter AUDIO_CHANNELS failed, value conversion failed.");
+    }
 }
 
 void AVSenderEngine::SetAudioSampleRate(const std::string &value)
@@ -449,9 +479,14 @@ void AVSenderEngine::SetAudioSampleRate(const std::string &value)
         AVTRANS_LOGE("avInput_ or avOutput_ is nullptr.");
         return;
     }
-    avInput_->SetParameter(static_cast<int32_t>(Plugin::Tag::AUDIO_SAMPLE_RATE), std::stoi(value));
-    avOutput_->SetParameter(static_cast<int32_t>(Plugin::Tag::AUDIO_SAMPLE_RATE), std::stoi(value));
-    AVTRANS_LOGI("SetParameter AUDIO_SAMPLE_RATE success, audio sample rate = %{public}s", value.c_str());
+    int intValue = 0;
+    if (convertToInt(value, intValue)) {
+        avInput_->SetParameter(static_cast<int32_t>(Plugin::Tag::AUDIO_SAMPLE_RATE), intValue);
+        avOutput_->SetParameter(static_cast<int32_t>(Plugin::Tag::AUDIO_SAMPLE_RATE), intValue);
+        AVTRANS_LOGI("SetParameter AUDIO_SAMPLE_RATE success, audio sample rate = %{public}s", value.c_str());
+    } else {
+        AVTRANS_LOGI("SetParameter AUDIO_SAMPLE_RATE failed, value conversion failed.");
+    }
 }
 
 void AVSenderEngine::SetAudioChannelLayout(const std::string &value)
@@ -460,9 +495,14 @@ void AVSenderEngine::SetAudioChannelLayout(const std::string &value)
         AVTRANS_LOGE("avInput_ or avOutput_ is nullptr.");
         return;
     }
-    avInput_->SetParameter(static_cast<int32_t>(Plugin::Tag::AUDIO_CHANNEL_LAYOUT), std::stoi(value));
-    avOutput_->SetParameter(static_cast<int32_t>(Plugin::Tag::AUDIO_CHANNEL_LAYOUT), std::stoi(value));
-    AVTRANS_LOGI("SetParameter AUDIO_CHANNEL_LAYOUT success, audio channel layout = %{public}s", value.c_str());
+    int intValue = 0;
+    if (convertToInt(value, intValue)) {
+        avInput_->SetParameter(static_cast<int32_t>(Plugin::Tag::AUDIO_CHANNEL_LAYOUT), intValue);
+        avOutput_->SetParameter(static_cast<int32_t>(Plugin::Tag::AUDIO_CHANNEL_LAYOUT), intValue);
+        AVTRANS_LOGI("SetParameter AUDIO_CHANNEL_LAYOUT success, audio channel layout = %{public}s", value.c_str());
+    } else {
+        AVTRANS_LOGI("SetParameter AUDIO_CHANNEL_LAYOUT failed, value conversion failed.");
+    }
 }
 
 void AVSenderEngine::SetAudioSampleFormat(const std::string &value)
@@ -471,8 +511,13 @@ void AVSenderEngine::SetAudioSampleFormat(const std::string &value)
         AVTRANS_LOGE("avInput_ is nullptr.");
         return;
     }
-    avInput_->SetParameter(static_cast<int32_t>(Plugin::Tag::AUDIO_SAMPLE_FORMAT), std::stoi(value));
-    AVTRANS_LOGI("SetParameter AUDIO_SAMPLE_FORMAT success, audio sample format = %{public}s", value.c_str());
+    int intValue = 0;
+    if (convertToInt(value, intValue)) {
+        avInput_->SetParameter(static_cast<int32_t>(Plugin::Tag::AUDIO_SAMPLE_FORMAT), intValue);
+        AVTRANS_LOGI("SetParameter AUDIO_SAMPLE_FORMAT success, audio sample format = %{public}s", value.c_str());
+    } else {
+        AVTRANS_LOGI("SetParameter AUDIO_SAMPLE_FORMAT failed, value conversion failed.");
+    }
 }
 
 void AVSenderEngine::SetAudioFrameSize(const std::string &value)
@@ -481,8 +526,13 @@ void AVSenderEngine::SetAudioFrameSize(const std::string &value)
         AVTRANS_LOGE("avInput_ is nullptr.");
         return;
     }
-    avInput_->SetParameter(static_cast<int32_t>(Plugin::Tag::AUDIO_SAMPLE_PER_FRAME), std::stoi(value));
-    AVTRANS_LOGI("SetParameter AUDIO_SAMPLE_PER_FRAME success, audio sample per frame = %{public}s", value.c_str());
+    int intValue = 0;
+    if (convertToInt(value, intValue)) {
+        avInput_->SetParameter(static_cast<int32_t>(Plugin::Tag::AUDIO_SAMPLE_PER_FRAME), intValue);
+        AVTRANS_LOGI("SetParameter AUDIO_SAMPLE_PER_FRAME success, audio sample per frame = %{public}s", value.c_str());
+    } else {
+        AVTRANS_LOGI("SetParameter AUDIO_SAMPLE_PER_FRAME failed, value conversion failed.");
+    }
 }
 
 void AVSenderEngine::SetSharedMemoryFd(const std::string &value)
diff --git a/av_transport/common/include/av_trans_utils.h b/av_transport/common/include/av_trans_utils.h
index b7cf17e2..3fb6f614 100644
--- a/av_transport/common/include/av_trans_utils.h
+++ b/av_transport/common/include/av_trans_utils.h
@@ -57,6 +57,8 @@ bool IsUInt32(const cJSON *jsonObj, const std::string &key);
 bool IsInt64(const cJSON *jsonObj, const std::string &key);
 bool IsString(const cJSON *jsonObj, const std::string &key);
 
+bool convertToInt(const std::string& str, int& value);
+
 int64_t GetCurrentTime();
 
 void GenerateAdtsHeader(unsigned char* adtsHeader, uint32_t packetLen, uint32_t profile, uint32_t sampleRate,
diff --git a/av_transport/common/src/av_trans_utils.cpp b/av_transport/common/src/av_trans_utils.cpp
index d712e1a9..280ff5c8 100644
--- a/av_transport/common/src/av_trans_utils.cpp
+++ b/av_transport/common/src/av_trans_utils.cpp
@@ -16,6 +16,7 @@
 #include "av_trans_utils.h"
 
 #include <cstddef>
+#include <charconv>
 #include <securec.h>
 
 #include "av_trans_constants.h"
@@ -182,9 +183,13 @@ void Convert2HiSBufferMeta(std::shared_ptr<AVTransBuffer> transBuffer, std::shar
         hisVMeta->height_ = static_cast<uint32_t>(std::atoi(value.c_str()));
 
         TRUE_LOG_MSG(!transMeta->GetMetaItem(AVTransTag::PRE_TIMESTAMP, value), "get PRE_TIMESTAMP meta failed");
-        hisVMeta->pts_ = std::stoll(value.c_str());
 
-        hisBuffer->pts = std::stoll(value.c_str());
+        unsigned long num;
+        auto res = std::from_chars(value.data(), value.data() + value.size(), num);
+        if (res.ec == std::errc()) {
+            hisVMeta->pts_ = num;
+            hisBuffer->pts = num;
+        }
         hisBuffer->UpdateBufferMeta(*hisVMeta);
     }
 }
@@ -273,6 +278,12 @@ bool IsString(const cJSON *jsonObj, const std::string &key)
         strlen(cJSON_GetStringValue(keyObj)) <= MAX_MESSAGES_LEN;
 }
 
+bool convertToInt(const std::string& str, int& value)
+{
+    auto [ptr, ec] = std::from_chars(str.data(), str.data() + str.size(), value);
+    return ec == std::errc{} && ptr == str.data() + str.size();
+}
+
 int64_t GetCurrentTime()
 {
     struct timespec time = { 0, 0 };
-- 
Gitee


From c4b8d214f90f7a0b3f3fd20cb65ddcd185764bf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A6=E5=9B=BD=E5=BA=86?= <weiguoqing2@huawei.com>
Date: Tue, 8 Apr 2025 11:30:58 +0000
Subject: [PATCH 2/5] update
 av_transport/av_trans_engine/av_receiver/src/av_receiver_engine.cpp.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 韦国庆 <weiguoqing2@huawei.com>
---
 .../av_receiver/src/av_receiver_engine.cpp    | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/av_transport/av_trans_engine/av_receiver/src/av_receiver_engine.cpp b/av_transport/av_trans_engine/av_receiver/src/av_receiver_engine.cpp
index 6bd2332a..fc796996 100644
--- a/av_transport/av_trans_engine/av_receiver/src/av_receiver_engine.cpp
+++ b/av_transport/av_trans_engine/av_receiver/src/av_receiver_engine.cpp
@@ -352,7 +352,7 @@ void AVReceiverEngine::SetVideoWidth(const std::string &value)
         return;
     }
     int intValue = 0;
-    if (convertToInt(value, intValue)) {
+    if (ConvertToInt(value, intValue)) {
         avInput_->SetParameter(static_cast<int32_t>(Plugin::Tag::VIDEO_WIDTH), intValue);
         AVTRANS_LOGI("SetParameter VIDEO_WIDTH success, video width = %{public}s", value.c_str());
     } else {
@@ -367,7 +367,7 @@ void AVReceiverEngine::SetVideoHeight(const std::string &value)
         return;
     }
     int intValue = 0;
-    if (convertToInt(value, intValue)) {
+    if (ConvertToInt(value, intValue)) {
         avInput_->SetParameter(static_cast<int32_t>(Plugin::Tag::VIDEO_HEIGHT), intValue);
         AVTRANS_LOGI("SetParameter VIDEO_HEIGHT success, video height = %{public}s", value.c_str());
     } else {
@@ -382,7 +382,7 @@ void AVReceiverEngine::SetVideoFrameRate(const std::string &value)
         return;
     }
     int intValue = 0;
-    if (convertToInt(value, intValue)) {
+    if (ConvertToInt(value, intValue)) {
         avInput_->SetParameter(static_cast<int32_t>(Plugin::Tag::VIDEO_FRAME_RATE), intValue);
         avOutput_->SetParameter(static_cast<int32_t>(Plugin::Tag::VIDEO_FRAME_RATE), intValue);
         AVTRANS_LOGI("SetParameter VIDEO_FRAME_RATE success, frame rate = %{public}s", value.c_str());
@@ -398,7 +398,7 @@ void AVReceiverEngine::SetAudioBitRate(const std::string &value)
         return;
     }
     int intValue = 0;
-    if (convertToInt(value, intValue)) {
+    if (ConvertToInt(value, intValue)) {
         avInput_->SetParameter(static_cast<int32_t>(Plugin::Tag::MEDIA_BITRATE), intValue);
         AVTRANS_LOGI("SetParameter MEDIA_BITRATE success, bit rate = %{public}s", value.c_str());
     } else {
@@ -413,7 +413,7 @@ void AVReceiverEngine::SetVideoBitRate(const std::string &value)
         return;
     }
     int intValue = 0;
-    if (convertToInt(value, intValue)) {
+    if (ConvertToInt(value, intValue)) {
         avInput_->SetParameter(static_cast<int32_t>(Plugin::Tag::MEDIA_BITRATE), intValue);
         AVTRANS_LOGI("SetParameter MEDIA_BITRATE success, bit rate = %{public}s", value.c_str());
     } else {
@@ -464,7 +464,7 @@ void AVReceiverEngine::SetAudioChannelMask(const std::string &value)
         return;
     }
     int intValue = 0;
-    if (convertToInt(value, intValue)) {
+    if (ConvertToInt(value, intValue)) {
         avInput_->SetParameter(static_cast<int32_t>(Plugin::Tag::AUDIO_CHANNELS), intValue);
         avOutput_->SetParameter(static_cast<int32_t>(Plugin::Tag::AUDIO_CHANNELS), intValue);
         AVTRANS_LOGI("SetParameter AUDIO_CHANNELS success, audio channels = %{public}s", value.c_str());
@@ -480,7 +480,7 @@ void AVReceiverEngine::SetAudioSampleRate(const std::string &value)
         return;
     }
     int intValue = 0;
-    if (convertToInt(value, intValue)) {
+    if (ConvertToInt(value, intValue)) {
         avInput_->SetParameter(static_cast<int32_t>(Plugin::Tag::AUDIO_SAMPLE_RATE), intValue);
         avOutput_->SetParameter(static_cast<int32_t>(Plugin::Tag::AUDIO_SAMPLE_RATE), intValue);
         AVTRANS_LOGI("SetParameter AUDIO_SAMPLE_RATE success, audio sample rate = %{public}s", value.c_str());
@@ -496,7 +496,7 @@ void AVReceiverEngine::SetAudioChannelLayout(const std::string &value)
         return;
     }
     int intValue = 0;
-    if (convertToInt(value, intValue)) {
+    if (ConvertToInt(value, intValue)) {
         avInput_->SetParameter(static_cast<int32_t>(Plugin::Tag::AUDIO_CHANNEL_LAYOUT), intValue);
         avOutput_->SetParameter(static_cast<int32_t>(Plugin::Tag::AUDIO_CHANNEL_LAYOUT), intValue);
         AVTRANS_LOGI("SetParameter AUDIO_CHANNEL_LAYOUT success, audio channel layout = %{public}s", value.c_str());
@@ -512,7 +512,7 @@ void AVReceiverEngine::SetAudioSampleFormat(const std::string &value)
         return;
     }
     int intValue = 0;
-    if (convertToInt(value, intValue)) {
+    if (ConvertToInt(value, intValue)) {
         avInput_->SetParameter(static_cast<int32_t>(Plugin::Tag::AUDIO_SAMPLE_FORMAT), intValue);
         AVTRANS_LOGI("SetParameter AUDIO_SAMPLE_FORMAT success, audio sample format = %{public}s", value.c_str());
     } else {
@@ -527,7 +527,7 @@ void AVReceiverEngine::SetAudioFrameSize(const std::string &value)
         return;
     }
     int intValue = 0;
-    if (convertToInt(value, intValue)) {
+    if (ConvertToInt(value, intValue)) {
         avInput_->SetParameter(static_cast<int32_t>(Plugin::Tag::AUDIO_SAMPLE_PER_FRAME), intValue);
         AVTRANS_LOGI("SetParameter AUDIO_SAMPLE_PER_FRAME success, audio sample per frame = %{public}s", value.c_str());
     } else {
-- 
Gitee


From 358c62a4a9bf59d1fc60f78b647132232f6cec44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A6=E5=9B=BD=E5=BA=86?= <weiguoqing2@huawei.com>
Date: Tue, 8 Apr 2025 11:32:13 +0000
Subject: [PATCH 3/5] update
 av_transport/av_trans_engine/av_sender/src/av_sender_engine.cpp.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 韦国庆 <weiguoqing2@huawei.com>
---
 .../av_sender/src/av_sender_engine.cpp        | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/av_transport/av_trans_engine/av_sender/src/av_sender_engine.cpp b/av_transport/av_trans_engine/av_sender/src/av_sender_engine.cpp
index ace6ce36..e02fb25b 100644
--- a/av_transport/av_trans_engine/av_sender/src/av_sender_engine.cpp
+++ b/av_transport/av_trans_engine/av_sender/src/av_sender_engine.cpp
@@ -327,7 +327,7 @@ void AVSenderEngine::SetVideoWidth(const std::string &value)
         return;
     }
     int intValue = 0;
-    if (convertToInt(value, intValue)) {
+    if (ConvertToInt(value, intValue)) {
         avInput_->SetParameter(static_cast<int32_t>(Plugin::Tag::VIDEO_WIDTH), intValue);
         AVTRANS_LOGI("SetParameter VIDEO_WIDTH success, video width = %{public}s", value.c_str());
     } else {
@@ -342,7 +342,7 @@ void AVSenderEngine::SetVideoHeight(const std::string &value)
         return;
     }
     int intValue = 0;
-    if (convertToInt(value, intValue)) {
+    if (ConvertToInt(value, intValue)) {
         avInput_->SetParameter(static_cast<int32_t>(Plugin::Tag::VIDEO_HEIGHT), intValue);
         AVTRANS_LOGI("SetParameter VIDEO_HEIGHT success, video height = %{public}s", value.c_str());
     } else {
@@ -367,7 +367,7 @@ void AVSenderEngine::SetVideoFrameRate(const std::string &value)
         return;
     }
     int intValue = 0;
-    if (convertToInt(value, intValue)) {
+    if (ConvertToInt(value, intValue)) {
         avInput_->SetParameter(static_cast<int32_t>(Plugin::Tag::VIDEO_FRAME_RATE), intValue);
         avOutput_->SetParameter(static_cast<int32_t>(Plugin::Tag::VIDEO_FRAME_RATE), intValue);
         AVTRANS_LOGI("SetParameter VIDEO_FRAME_RATE success, frame rate = %{public}s", value.c_str());
@@ -383,7 +383,7 @@ void AVSenderEngine::SetAudioBitRate(const std::string &value)
         return;
     }
     int intValue = 0;
-    if (convertToInt(value, intValue)) {
+    if (ConvertToInt(value, intValue)) {
         avInput_->SetParameter(static_cast<int32_t>(Plugin::Tag::MEDIA_BITRATE), intValue);
         AVTRANS_LOGI("SetParameter MEDIA_BITRATE success, bit rate = %{public}s", value.c_str());
     } else {
@@ -398,7 +398,7 @@ void AVSenderEngine::SetVideoBitRate(const std::string &value)
         return;
     }
     int intValue = 0;
-    if (convertToInt(value, intValue)) {
+    if (ConvertToInt(value, intValue)) {
         avInput_->SetParameter(static_cast<int32_t>(Plugin::Tag::MEDIA_BITRATE), intValue);
         AVTRANS_LOGI("SetParameter MEDIA_BITRATE success, bit rate = %{public}s", value.c_str());
     } else {
@@ -464,7 +464,7 @@ void AVSenderEngine::SetAudioChannelMask(const std::string &value)
         return;
     }
     int intValue = 0;
-    if (convertToInt(value, intValue)) {
+    if (ConvertToInt(value, intValue)) {
         avInput_->SetParameter(static_cast<int32_t>(Plugin::Tag::AUDIO_CHANNELS), intValue);
         avOutput_->SetParameter(static_cast<int32_t>(Plugin::Tag::AUDIO_CHANNELS), intValue);
         AVTRANS_LOGI("SetParameter AUDIO_CHANNELS success, audio channels = %{public}s", value.c_str());
@@ -480,7 +480,7 @@ void AVSenderEngine::SetAudioSampleRate(const std::string &value)
         return;
     }
     int intValue = 0;
-    if (convertToInt(value, intValue)) {
+    if (ConvertToInt(value, intValue)) {
         avInput_->SetParameter(static_cast<int32_t>(Plugin::Tag::AUDIO_SAMPLE_RATE), intValue);
         avOutput_->SetParameter(static_cast<int32_t>(Plugin::Tag::AUDIO_SAMPLE_RATE), intValue);
         AVTRANS_LOGI("SetParameter AUDIO_SAMPLE_RATE success, audio sample rate = %{public}s", value.c_str());
@@ -496,7 +496,7 @@ void AVSenderEngine::SetAudioChannelLayout(const std::string &value)
         return;
     }
     int intValue = 0;
-    if (convertToInt(value, intValue)) {
+    if (ConvertToInt(value, intValue)) {
         avInput_->SetParameter(static_cast<int32_t>(Plugin::Tag::AUDIO_CHANNEL_LAYOUT), intValue);
         avOutput_->SetParameter(static_cast<int32_t>(Plugin::Tag::AUDIO_CHANNEL_LAYOUT), intValue);
         AVTRANS_LOGI("SetParameter AUDIO_CHANNEL_LAYOUT success, audio channel layout = %{public}s", value.c_str());
@@ -512,7 +512,7 @@ void AVSenderEngine::SetAudioSampleFormat(const std::string &value)
         return;
     }
     int intValue = 0;
-    if (convertToInt(value, intValue)) {
+    if (ConvertToInt(value, intValue)) {
         avInput_->SetParameter(static_cast<int32_t>(Plugin::Tag::AUDIO_SAMPLE_FORMAT), intValue);
         AVTRANS_LOGI("SetParameter AUDIO_SAMPLE_FORMAT success, audio sample format = %{public}s", value.c_str());
     } else {
@@ -527,7 +527,7 @@ void AVSenderEngine::SetAudioFrameSize(const std::string &value)
         return;
     }
     int intValue = 0;
-    if (convertToInt(value, intValue)) {
+    if (ConvertToInt(value, intValue)) {
         avInput_->SetParameter(static_cast<int32_t>(Plugin::Tag::AUDIO_SAMPLE_PER_FRAME), intValue);
         AVTRANS_LOGI("SetParameter AUDIO_SAMPLE_PER_FRAME success, audio sample per frame = %{public}s", value.c_str());
     } else {
-- 
Gitee


From efafd74d31415512e29bcd9a39e1ba0e005dfa14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A6=E5=9B=BD=E5=BA=86?= <weiguoqing2@huawei.com>
Date: Tue, 8 Apr 2025 11:33:03 +0000
Subject: [PATCH 4/5] update av_transport/common/include/av_trans_utils.h.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 韦国庆 <weiguoqing2@huawei.com>
---
 av_transport/common/include/av_trans_utils.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/av_transport/common/include/av_trans_utils.h b/av_transport/common/include/av_trans_utils.h
index 3fb6f614..ad5f1cac 100644
--- a/av_transport/common/include/av_trans_utils.h
+++ b/av_transport/common/include/av_trans_utils.h
@@ -57,7 +57,7 @@ bool IsUInt32(const cJSON *jsonObj, const std::string &key);
 bool IsInt64(const cJSON *jsonObj, const std::string &key);
 bool IsString(const cJSON *jsonObj, const std::string &key);
 
-bool convertToInt(const std::string& str, int& value);
+bool ConvertToInt(const std::string& str, int& value);
 
 int64_t GetCurrentTime();
 
-- 
Gitee


From b648584bdc594214452e5c6a25251b0952cddaf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A6=E5=9B=BD=E5=BA=86?= <weiguoqing2@huawei.com>
Date: Tue, 8 Apr 2025 11:33:37 +0000
Subject: [PATCH 5/5] update av_transport/common/src/av_trans_utils.cpp.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 韦国庆 <weiguoqing2@huawei.com>
---
 av_transport/common/src/av_trans_utils.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/av_transport/common/src/av_trans_utils.cpp b/av_transport/common/src/av_trans_utils.cpp
index 280ff5c8..4a737505 100644
--- a/av_transport/common/src/av_trans_utils.cpp
+++ b/av_transport/common/src/av_trans_utils.cpp
@@ -278,7 +278,7 @@ bool IsString(const cJSON *jsonObj, const std::string &key)
         strlen(cJSON_GetStringValue(keyObj)) <= MAX_MESSAGES_LEN;
 }
 
-bool convertToInt(const std::string& str, int& value)
+bool ConvertToInt(const std::string& str, int& value)
 {
     auto [ptr, ec] = std::from_chars(str.data(), str.data() + str.size(), value);
     return ec == std::errc{} && ptr == str.data() + str.size();
-- 
Gitee