From 729eb69fa9d4b7c90d592d92739b6fb2702fe1af Mon Sep 17 00:00:00 2001 From: chen0088 Date: Thu, 7 Mar 2024 21:03:58 +0800 Subject: [PATCH] modify max latency Signed-off-by: chen0088 --- common/include/constants/distributed_camera_constants.h | 2 +- .../unittest/common/channel/dcamera_channel_sink_impl_test.cpp | 1 - .../common/channel/dcamera_channel_source_impl_test.cpp | 1 - .../unittest/common/channel/dcamera_softbus_adapter_test.cpp | 1 - .../unittest/common/channel/dcamera_softbus_session_test.cpp | 1 - .../multimedia_codec/decoder/decode_data_process.h | 2 +- .../multimedia_codec/encoder/encode_data_process.h | 2 +- .../multimedia_codec/decoder/decode_data_process.cpp | 2 +- .../multimedia_codec/decoder/decode_data_process_common.cpp | 2 +- .../multimedia_codec/encoder/encode_data_process.cpp | 2 +- 10 files changed, 6 insertions(+), 10 deletions(-) diff --git a/common/include/constants/distributed_camera_constants.h b/common/include/constants/distributed_camera_constants.h index 46908bb1..ecacb3df 100644 --- a/common/include/constants/distributed_camera_constants.h +++ b/common/include/constants/distributed_camera_constants.h @@ -123,7 +123,7 @@ const int32_t HICOLLIE_DELAY_TIME_MS = 5 * 1000; const size_t HICOLLIE_SLEEP_TIME_US = 5 * 1000 * 1000; const int32_t DCAMERA_QOS_TYPE_MIN_BW = 40 * 1024 * 1024; -const int32_t DCAMERA_QOS_TYPE_MAX_LATENCY = 4000; +const int32_t DCAMERA_QOS_TYPE_MAX_LATENCY = 8000; const int32_t DCAMERA_QOS_TYPE_MIN_LATENCY = 2000; const int32_t CAMERA_META_DATA_ITEM_CAPACITY = 10; diff --git a/services/channel/test/unittest/common/channel/dcamera_channel_sink_impl_test.cpp b/services/channel/test/unittest/common/channel/dcamera_channel_sink_impl_test.cpp index 163dc110..6e4acda2 100644 --- a/services/channel/test/unittest/common/channel/dcamera_channel_sink_impl_test.cpp +++ b/services/channel/test/unittest/common/channel/dcamera_channel_sink_impl_test.cpp @@ -26,7 +26,6 @@ #include "distributed_camera_errno.h" #include "icamera_channel.h" #include "session_bus_center.h" -#include "session.h" #include "mock_camera_operator.h" diff --git a/services/channel/test/unittest/common/channel/dcamera_channel_source_impl_test.cpp b/services/channel/test/unittest/common/channel/dcamera_channel_source_impl_test.cpp index c608d48c..9efe6b65 100644 --- a/services/channel/test/unittest/common/channel/dcamera_channel_source_impl_test.cpp +++ b/services/channel/test/unittest/common/channel/dcamera_channel_source_impl_test.cpp @@ -26,7 +26,6 @@ #include "data_buffer.h" #include "icamera_channel.h" #include "session_bus_center.h" -#include "session.h" #include "mock_dcamera_source_dev.h" #include "mock_dcamera_source_state_listener.h" diff --git a/services/channel/test/unittest/common/channel/dcamera_softbus_adapter_test.cpp b/services/channel/test/unittest/common/channel/dcamera_softbus_adapter_test.cpp index 68706159..5047e4b9 100644 --- a/services/channel/test/unittest/common/channel/dcamera_softbus_adapter_test.cpp +++ b/services/channel/test/unittest/common/channel/dcamera_softbus_adapter_test.cpp @@ -26,7 +26,6 @@ #include "distributed_camera_constants.h" #include "distributed_camera_errno.h" #include "session_bus_center.h" -#include "session.h" using namespace testing::ext; diff --git a/services/channel/test/unittest/common/channel/dcamera_softbus_session_test.cpp b/services/channel/test/unittest/common/channel/dcamera_softbus_session_test.cpp index 6b3ff9c9..ace920ca 100644 --- a/services/channel/test/unittest/common/channel/dcamera_softbus_session_test.cpp +++ b/services/channel/test/unittest/common/channel/dcamera_softbus_session_test.cpp @@ -29,7 +29,6 @@ #include "icamera_channel.h" #include "mock_camera_operator.h" #include "session_bus_center.h" -#include "session.h" using namespace testing::ext; diff --git a/services/data_process/include/pipeline_node/multimedia_codec/decoder/decode_data_process.h b/services/data_process/include/pipeline_node/multimedia_codec/decoder/decode_data_process.h index 72d749b1..6cfb5f95 100644 --- a/services/data_process/include/pipeline_node/multimedia_codec/decoder/decode_data_process.h +++ b/services/data_process/include/pipeline_node/multimedia_codec/decoder/decode_data_process.h @@ -106,7 +106,7 @@ private: constexpr static int32_t MAX_RGB32_BUFFER_SIZE = 1920 * 1080 * 4 * 2; constexpr static int32_t MAX_BUFFER_SIZE = 1920 * 1080 * 4 * 2; constexpr static int32_t MIN_FRAME_RATE = 0; - constexpr static int32_t MAX_FRAME_RATE = 30; + constexpr static double MAX_FRAME_RATE = 30; constexpr static int32_t MIN_VIDEO_WIDTH = 320; constexpr static int32_t MIN_VIDEO_HEIGHT = 240; constexpr static int32_t MAX_VIDEO_WIDTH = 1920; diff --git a/services/data_process/include/pipeline_node/multimedia_codec/encoder/encode_data_process.h b/services/data_process/include/pipeline_node/multimedia_codec/encoder/encode_data_process.h index f39bf6be..87b1dfff 100644 --- a/services/data_process/include/pipeline_node/multimedia_codec/encoder/encode_data_process.h +++ b/services/data_process/include/pipeline_node/multimedia_codec/encoder/encode_data_process.h @@ -88,7 +88,7 @@ private: constexpr static int64_t NORM_YUV420_BUFFER_SIZE = 1920 * 1080 * 3 / 2; constexpr static int32_t NORM_RGB32_BUFFER_SIZE = 1920 * 1080 * 4; constexpr static int32_t MIN_FRAME_RATE = 0; - constexpr static int32_t MAX_FRAME_RATE = 30; + constexpr static double MAX_FRAME_RATE = 30; constexpr static int32_t MIN_VIDEO_WIDTH = 320; constexpr static int32_t MIN_VIDEO_HEIGHT = 240; constexpr static int32_t MAX_VIDEO_WIDTH = 1920; diff --git a/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process.cpp b/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process.cpp index 66d68bff..ea3ef9d4 100644 --- a/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process.cpp +++ b/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process.cpp @@ -170,7 +170,7 @@ int32_t DecodeDataProcess::InitDecoderMetadataFormat() metadataFormat_.PutStringValue("codec_mime", processType_); metadataFormat_.PutIntValue("width", sourceConfig_.GetWidth()); metadataFormat_.PutIntValue("height", sourceConfig_.GetHeight()); - metadataFormat_.PutIntValue("frame_rate", MAX_FRAME_RATE); + metadataFormat_.PutDoubleValue("frame_rate", MAX_FRAME_RATE); return DCAMERA_OK; } diff --git a/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process_common.cpp b/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process_common.cpp index c79a7d74..3e2bfe85 100644 --- a/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process_common.cpp +++ b/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process_common.cpp @@ -199,7 +199,7 @@ int32_t DecodeDataProcess::InitDecoderMetadataFormat() metadataFormat_.PutStringValue("codec_mime", processType_); metadataFormat_.PutIntValue("width", sourceConfig_.GetWidth()); metadataFormat_.PutIntValue("height", sourceConfig_.GetHeight()); - metadataFormat_.PutIntValue("frame_rate", MAX_FRAME_RATE); + metadataFormat_.PutDoubleValue("frame_rate", MAX_FRAME_RATE); return DCAMERA_OK; } diff --git a/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_data_process.cpp b/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_data_process.cpp index d798c32c..0afa1dc2 100644 --- a/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_data_process.cpp +++ b/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_data_process.cpp @@ -202,7 +202,7 @@ int32_t EncodeDataProcess::InitEncoderMetadataFormat() metadataFormat_.PutStringValue("codec_mime", processType_); metadataFormat_.PutIntValue("width", static_cast(sourceConfig_.GetWidth())); metadataFormat_.PutIntValue("height", static_cast(sourceConfig_.GetHeight())); - metadataFormat_.PutIntValue("frame_rate", MAX_FRAME_RATE); + metadataFormat_.PutDoubleValue("frame_rate", MAX_FRAME_RATE); return DCAMERA_OK; } -- Gitee