diff --git a/common/include/constants/distributed_camera_constants.h b/common/include/constants/distributed_camera_constants.h index 46908bb136c83aca1135a6aad7f853e9e95937db..ecacb3dfa09e783c655cde4cdd366d19158fe389 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 163dc110de63e5488b0edcbd06ebec99c50c3ea5..6e4acda2eb092a6efbe6ac70ca27b6faffd7e297 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 c608d48cd9ef67961480068980c5c9717a15b3bb..9efe6b6561e9a2b696d6d9b1dcfb535c2bf1b9d5 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 687061599fc6e42ade72a205d398b967d142b80a..5047e4b9ae6db9837ed10a3b794d4c5966cb5598 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 6b3ff9c9a6738ee29b418620e5bd09d937d3a1e8..ace920ca11ee296772459daa7c5c98ffb72f1414 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 72d749b1cec8e690b8690a9526070e2d77199969..6cfb5f95557e7457850b4ce4b453627f8e1db903 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 f39bf6be6ea1742e9458b85d7d3db16ec60e854e..87b1dfff60d87452586ac37877f0a786e13f3c3e 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 66d68bff1993aca5c5cd04136d9f3a4441320dc6..ea3ef9d48b53be7c202379ada4e5dd9ac521dc83 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 c79a7d74664171ca788ae45957c922a4e8cb7d22..3e2bfe8598ae437769c12e4498d064e7829e52f1 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 d798c32c34facf620201011219431683b4d55fc6..0afa1dc2ecd20c42d09739d839d09bc614ee7279 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; }