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 e33b703ccedd2cd42b6030b6cb9373f8827a1de7..64631566c75e54e3b75de1a15f2ee01c1f890ea0 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 similarity index 97% 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 index d3ac3c65474a738c2f5306a6e2e2534348059e0a..dc775aaf807f5952550fed70544339e3763998e9 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 similarity index 91% 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 index 6bc033a675171d17da3468a7ce77f5811149c92f..6e35329561b629481acf881c12c426c48311e967 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 0724879b625767b7c3e75ad09adc9fbe4dceac5a..4375e4312e418383d2446f508aa9000fe1c8f2fb 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 c94fa63e09c4d625ec3822af647c12c363e34afc..5948281d2b33a8fc7e85f3cc65a561cc93c1e92e 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}, };