From 05cb1e8071fbb9301307a6b3bc46a6c1824c1bb1 Mon Sep 17 00:00:00 2001 From: w30042960 Date: Fri, 12 Jul 2024 16:07:27 +0800 Subject: [PATCH 1/3] modify LATENCY Signed-off-by: w30042960 --- .../fuzztest/onstreamreceived_fuzzer/BUILD.gn | 8 ++--- .../avtransOnSessionClosed_fuzzer.cpp | 2 +- .../avtransOnSessionClosed_fuzzer.h | 2 +- av_transport/common/src/av_trans_meta.cpp | 33 +++++++------------ .../common/src/softbus_channel_adapter.cpp | 4 +-- 5 files changed, 20 insertions(+), 29 deletions(-) diff --git a/av_transport/av_trans_control_center/test/fuzztest/onstreamreceived_fuzzer/BUILD.gn b/av_transport/av_trans_control_center/test/fuzztest/onstreamreceived_fuzzer/BUILD.gn index e33b703c..64631566 100644 --- a/av_transport/av_trans_control_center/test/fuzztest/onstreamreceived_fuzzer/BUILD.gn +++ b/av_transport/av_trans_control_center/test/fuzztest/onstreamreceived_fuzzer/BUILD.gn @@ -55,7 +55,7 @@ ohos_fuzztest("OnStreamReceivedFuzzTest") { ohos_fuzztest("OnBytesReceivedFuzzTest") { module_out_path = fuzz_test_output_path fuzz_config_file = - "${control_center_path}/test/fuzztest/onstreamreceived_fuzzer" + "${control_center_path}/test/fuzztest/onbytesreceived_fuzzer" include_dirs = [ "include", @@ -90,7 +90,7 @@ ohos_fuzztest("OnBytesReceivedFuzzTest") { ohos_fuzztest("OnSoftbusTimeSyncResultFuzzTest") { module_out_path = fuzz_test_output_path fuzz_config_file = - "${control_center_path}/test/fuzztest/onstreamreceived_fuzzer" + "${control_center_path}/test/fuzztest/onsoftbustimesyncresult_fuzzer" include_dirs = [ "include", @@ -125,7 +125,7 @@ ohos_fuzztest("OnSoftbusTimeSyncResultFuzzTest") { ohos_fuzztest("AVTransOnSessionClosedFuzzTest") { module_out_path = fuzz_test_output_path fuzz_config_file = - "${control_center_path}/test/fuzztest/onstreamreceived_fuzzer" + "${control_center_path}/test/fuzztest/avtransonsessionclosed_fuzzer" include_dirs = [ "include", @@ -140,7 +140,7 @@ ohos_fuzztest("AVTransOnSessionClosedFuzzTest") { "-Wno-unused-variable", "-fno-omit-frame-pointer", ] - sources = [ "avtransOnSessionClosed_fuzzer.cpp" ] + sources = [ "avtransonsessionclosed_fuzzer.cpp" ] deps = [ "${engine_path}/av_sender:distributed_av_sender" ] diff --git a/av_transport/av_trans_control_center/test/fuzztest/onstreamreceived_fuzzer/avtransOnSessionClosed_fuzzer.cpp b/av_transport/av_trans_control_center/test/fuzztest/onstreamreceived_fuzzer/avtransOnSessionClosed_fuzzer.cpp index d3ac3c65..dc775aaf 100644 --- a/av_transport/av_trans_control_center/test/fuzztest/onstreamreceived_fuzzer/avtransOnSessionClosed_fuzzer.cpp +++ b/av_transport/av_trans_control_center/test/fuzztest/onstreamreceived_fuzzer/avtransOnSessionClosed_fuzzer.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "avtransOnSessionClosed_fuzzer.h" +#include "avtransonsessionclosed_fuzzer.h" #include #include diff --git a/av_transport/av_trans_control_center/test/fuzztest/onstreamreceived_fuzzer/avtransOnSessionClosed_fuzzer.h b/av_transport/av_trans_control_center/test/fuzztest/onstreamreceived_fuzzer/avtransOnSessionClosed_fuzzer.h index 6bc033a6..6e353295 100644 --- a/av_transport/av_trans_control_center/test/fuzztest/onstreamreceived_fuzzer/avtransOnSessionClosed_fuzzer.h +++ b/av_transport/av_trans_control_center/test/fuzztest/onstreamreceived_fuzzer/avtransOnSessionClosed_fuzzer.h @@ -16,6 +16,6 @@ #ifndef TEST_AVTRANSONSESSIONCLOSED_FUZZER_H #define TEST_AVTRANSONSESSIONCLOSED_FUZZER_H -#define FUZZ_PROJECT_NAME "avtransOnSessionClosed_fuzzer.cpp" +#define FUZZ_PROJECT_NAME "avtransonsessionclosed_fuzzer.cpp" #endif \ No newline at end of file diff --git a/av_transport/common/src/av_trans_meta.cpp b/av_transport/common/src/av_trans_meta.cpp index 0724879b..4375e431 100644 --- a/av_transport/common/src/av_trans_meta.cpp +++ b/av_transport/common/src/av_trans_meta.cpp @@ -141,40 +141,31 @@ bool AVTransVideoBufferMeta::UnmarshalVideoMeta(const std::string& jsonStr) if (metaJson == nullptr) { return false; } + cJSON *typeObj = cJSON_GetObjectItemCaseSensitive(metaJson, META_DATA_TYPE.c_str()); - if (typeObj == nullptr || !IsUInt32(metaJson, META_DATA_TYPE)) { - cJSON_Delete(metaJson); - return false; + if (typeObj != nullptr && IsUInt32(metaJson, META_DATA_TYPE)) { + dataType_ = static_cast(typeObj->valueint); } - dataType_ = static_cast(typeObj->valueint); cJSON *timeStampObj = cJSON_GetObjectItemCaseSensitive(metaJson, META_TIMESTAMP.c_str()); - if (timeStampObj == nullptr || !IsInt64(metaJson, META_TIMESTAMP)) { - cJSON_Delete(metaJson); - return false; + if (timeStampObj != nullptr && IsInt64(metaJson, META_TIMESTAMP)) { + pts_ = static_cast(timeStampObj->valueint); } - pts_ = static_cast(timeStampObj->valueint); - + cJSON *numberObj = cJSON_GetObjectItemCaseSensitive(metaJson, META_FRAME_NUMBER.c_str()); - if (numberObj == nullptr || !IsUInt32(metaJson, META_FRAME_NUMBER)) { - cJSON_Delete(metaJson); - return false; + if (numberObj != nullptr && IsUInt32(metaJson, META_FRAME_NUMBER)) { + frameNum_ = static_cast(numberObj->valueint); } - frameNum_ = static_cast(numberObj->valueint); cJSON *extTimeStampObj = cJSON_GetObjectItemCaseSensitive(metaJson, META_EXT_TIMESTAMP.c_str()); - if (extTimeStampObj == nullptr || !IsInt64(metaJson, META_EXT_TIMESTAMP)) { - cJSON_Delete(metaJson); - return false; + if (extTimeStampObj != nullptr && IsInt64(metaJson, META_EXT_TIMESTAMP)) { + extPts_ = static_cast(extTimeStampObj->valueint); } - extPts_ = static_cast(extTimeStampObj->valueint); cJSON *extNumberObj = cJSON_GetObjectItemCaseSensitive(metaJson, META_EXT_FRAME_NUMBER.c_str()); - if (extNumberObj == nullptr || !IsUInt32(metaJson, META_EXT_FRAME_NUMBER)) { - cJSON_Delete(metaJson); - return false; + if (extNumberObj != nullptr && IsUInt32(metaJson, META_EXT_FRAME_NUMBER)) { + extFrameNum_ = static_cast(extNumberObj->valueint); } - extFrameNum_ =static_cast(extNumberObj->valueint); cJSON_Delete(metaJson); return true; } diff --git a/av_transport/common/src/softbus_channel_adapter.cpp b/av_transport/common/src/softbus_channel_adapter.cpp index c94fa63e..5948281d 100644 --- a/av_transport/common/src/softbus_channel_adapter.cpp +++ b/av_transport/common/src/softbus_channel_adapter.cpp @@ -190,7 +190,7 @@ int32_t SoftbusChannelAdapter::CreateChannelServer(const std::string& pkgName, c } QosTV qos[] = { {.qos = QOS_TYPE_MIN_BW, .value = 40 * 1024 * 1024}, - {.qos = QOS_TYPE_MAX_LATENCY, .value = 8000}, + {.qos = QOS_TYPE_MAX_LATENCY, .value = 4000}, {.qos = QOS_TYPE_MIN_LATENCY, .value = 2000}, }; @@ -276,7 +276,7 @@ int32_t SoftbusChannelAdapter::OpenSoftbusChannel(const std::string &mySessName, QosTV qos[] = { {.qos = QOS_TYPE_MIN_BW, .value = 40 * 1024 * 1024}, - {.qos = QOS_TYPE_MAX_LATENCY, .value = 8000}, + {.qos = QOS_TYPE_MAX_LATENCY, .value = 4000}, {.qos = QOS_TYPE_MIN_LATENCY, .value = 2000}, }; -- Gitee From a60a2dc5e44d855d20a6841cd424de833da5a9fc Mon Sep 17 00:00:00 2001 From: wangyupan Date: Sat, 13 Jul 2024 06:55:26 +0000 Subject: [PATCH 2/3] rename Signed-off-by: wangyupan --- ...SessionClosed_fuzzer.cpp => avtransonsessionclosed_fuzzer.cpp} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename av_transport/av_trans_control_center/test/fuzztest/onstreamreceived_fuzzer/{avtransOnSessionClosed_fuzzer.cpp => avtransonsessionclosed_fuzzer.cpp} (100%) diff --git a/av_transport/av_trans_control_center/test/fuzztest/onstreamreceived_fuzzer/avtransOnSessionClosed_fuzzer.cpp b/av_transport/av_trans_control_center/test/fuzztest/onstreamreceived_fuzzer/avtransonsessionclosed_fuzzer.cpp similarity index 100% rename from av_transport/av_trans_control_center/test/fuzztest/onstreamreceived_fuzzer/avtransOnSessionClosed_fuzzer.cpp rename to av_transport/av_trans_control_center/test/fuzztest/onstreamreceived_fuzzer/avtransonsessionclosed_fuzzer.cpp -- Gitee From d842b8341f3d22a81b2add97750175b8a4214a9e Mon Sep 17 00:00:00 2001 From: wangyupan Date: Sat, 13 Jul 2024 06:59:33 +0000 Subject: [PATCH 3/3] rename Signed-off-by: wangyupan --- ...nsOnSessionClosed_fuzzer.h => avtransonsessionclosed_fuzzer.h} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename av_transport/av_trans_control_center/test/fuzztest/onstreamreceived_fuzzer/{avtransOnSessionClosed_fuzzer.h => avtransonsessionclosed_fuzzer.h} (100%) diff --git a/av_transport/av_trans_control_center/test/fuzztest/onstreamreceived_fuzzer/avtransOnSessionClosed_fuzzer.h b/av_transport/av_trans_control_center/test/fuzztest/onstreamreceived_fuzzer/avtransonsessionclosed_fuzzer.h similarity index 100% rename from av_transport/av_trans_control_center/test/fuzztest/onstreamreceived_fuzzer/avtransOnSessionClosed_fuzzer.h rename to av_transport/av_trans_control_center/test/fuzztest/onstreamreceived_fuzzer/avtransonsessionclosed_fuzzer.h -- Gitee