已合并
日志修改 #974
chen0088创建于 10 天前
日志修改 #974
已合并
共 4 个文件变更+7-6
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | - * Copyright (c) 2021-2025 Huawei Device Co., Ltd. | 2 | + * Copyright (c) 2021-2026 Huawei Device Co., Ltd. |
| 3 | * Licensed under the Apache License, Version 2.0 (the "License"); | 3 | * Licensed under the Apache License, Version 2.0 (the "License"); |
| 4 | * you may not use this file except in compliance with the License. | 4 | * you may not use this file except in compliance with the License. |
| 5 | * You may obtain a copy of the License at | 5 | * You may obtain a copy of the License at |
| @@ -89,7 +89,7 @@ public: | |||
| 89 | bool GetSrcConnect(); | 89 | bool GetSrcConnect(); |
| 90 | bool GetSinkConnect(); | 90 | bool GetSinkConnect(); |
| 91 | private: | 91 | private: |
| 92 | - bool isSoftbusConnectSource_ = false; | 92 | + bool isSoftbusConnectSource_ = true; |
 | |||
| 93 | bool isSoftbusConnectSink_ = false; | 93 | bool isSoftbusConnectSink_ = false; |
| 94 | }; | 94 | }; |
| 95 | 95 | ||
| @@ -429,7 +429,7 @@ int32_t DistributedCameraSinkService::StopDistributedHardware(const std::string | |||
| 429 | int32_t DistributedCameraSinkService::SetAccessListener(const sptr<IAccessListener> &listener, | 429 | int32_t DistributedCameraSinkService::SetAccessListener(const sptr<IAccessListener> &listener, |
| 430 | int32_t timeOut, const std::string &pkgName) | 430 | int32_t timeOut, const std::string &pkgName) |
| 431 | { | 431 | { |
| 432 | - DHLOGI("SetAccessListener, pkgName: %{public}s, timeOut: %{public}d", pkgName.c_str(), timeOut); | 432 | + DHLOGI("SetAccessListener, pkgName: %{public}s, timeOut: %{public}d", GetAnonyString(pkgName).c_str(), timeOut); |
| 433 | if (listener == nullptr) { | 433 | if (listener == nullptr) { |
| 434 | DHLOGE("listener is nullptr"); | 434 | DHLOGE("listener is nullptr"); |
| 435 | return DCAMERA_BAD_VALUE; | 435 | return DCAMERA_BAD_VALUE; |
| @@ -451,7 +451,7 @@ int32_t DistributedCameraSinkService::SetAccessListener(const sptr<IAccessListen | |||
| 451 | 451 | ||
| 452 | int32_t DistributedCameraSinkService::RemoveAccessListener(const std::string &pkgName) | 452 | int32_t DistributedCameraSinkService::RemoveAccessListener(const std::string &pkgName) |
| 453 | { | 453 | { |
| 454 | - DHLOGI("RemoveAccessListener, pkgName: %{public}s", pkgName.c_str()); | 454 | + DHLOGI("RemoveAccessListener, pkgName: %{public}s", GetAnonyString(pkgName).c_str()); |
| 455 | if (pkgName.empty()) { | 455 | if (pkgName.empty()) { |
| 456 | DHLOGE("pkgName is empty"); | 456 | DHLOGE("pkgName is empty"); |
| 457 | return DCAMERA_BAD_VALUE; | 457 | return DCAMERA_BAD_VALUE; |
| @@ -126,7 +126,6 @@ private: | |||
| 126 | constexpr static int32_t VIDEO_DECODER_QUEUE_MAX = 1000; | 126 | constexpr static int32_t VIDEO_DECODER_QUEUE_MAX = 1000; |
| 127 | constexpr static int32_t MAX_YUV420_BUFFER_SIZE = 1920 * 1080 * 3 / 2 * 2; | 127 | constexpr static int32_t MAX_YUV420_BUFFER_SIZE = 1920 * 1080 * 3 / 2 * 2; |
| 128 | constexpr static int32_t MAX_RGB32_BUFFER_SIZE = 1920 * 1080 * 4 * 2; | 128 | constexpr static int32_t MAX_RGB32_BUFFER_SIZE = 1920 * 1080 * 4 * 2; |
| 129 | - constexpr static int32_t MAX_BUFFER_SIZE = 1920 * 1080 * 4 * 2; | ||
| 130 | constexpr static int32_t MIN_FRAME_RATE = 0; | 129 | constexpr static int32_t MIN_FRAME_RATE = 0; |
| 131 | constexpr static double MAX_FRAME_RATE = 30; | 130 | constexpr static double MAX_FRAME_RATE = 30; |
| 132 | constexpr static int32_t MIN_VIDEO_WIDTH = 320; | 131 | constexpr static int32_t MIN_VIDEO_WIDTH = 320; |
Mservices/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process_common.cpp+3-1
| @@ -429,7 +429,9 @@ int32_t DecodeDataProcess::ProcessData(std::vector<std::shared_ptr<DataBuffer>>& | |||
| 429 | DHLOGE("video decoder input buffers queue over flow."); | 429 | DHLOGE("video decoder input buffers queue over flow."); |
| 430 | return DCAMERA_INDEX_OVERFLOW; | 430 | return DCAMERA_INDEX_OVERFLOW; |
| 431 | } | 431 | } |
| 432 | - if (inputBuffers[0]->Size() > MAX_BUFFER_SIZE) { | 432 | + size_t maxBufferSize = (processedConfig_.GetVideoformat() == Videoformat::RGBA_8888) ? |
| 433 | + MAX_RGB32_BUFFER_SIZE : MAX_YUV420_BUFFER_SIZE; | ||
| 434 | + if (inputBuffers[0]->Size() > maxBufferSize) { | ||
| 433 | DHLOGE("DecodeNode input buffer size %{public}zu error.", inputBuffers[0]->Size()); | 435 | DHLOGE("DecodeNode input buffer size %{public}zu error.", inputBuffers[0]->Size()); |
| 434 | return DCAMERA_MEMORY_OPT_ERROR; | 436 | return DCAMERA_MEMORY_OPT_ERROR; |
| 435 | } | 437 | } |
改这个值的原因是？