From 40c75d02e1ef3767fe3f03430c5afb9f52359575 Mon Sep 17 00:00:00 2001 From: huang-jianfei200 Date: Tue, 12 Sep 2023 19:28:43 +0800 Subject: [PATCH] Rectify super large functions Signed-off-by: huang-jianfei200 Change-Id: Ie49b3f37a18c470ce4dcdb6d6281e276302e22b7 --- services/impl/audio_encoder/audio_encoder.cpp | 24 ++++++++++++------- .../audio_encoder/include/audio_encoder.h | 1 + services/server/src/audio_capturer_server.cpp | 4 +--- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/services/impl/audio_encoder/audio_encoder.cpp b/services/impl/audio_encoder/audio_encoder.cpp index b0b69ad..e9e692a 100644 --- a/services/impl/audio_encoder/audio_encoder.cpp +++ b/services/impl/audio_encoder/audio_encoder.cpp @@ -119,16 +119,8 @@ static AudioSoundMode ConvertSoundMode(uint32_t channelCount) } } -int32_t AudioEncoder::InitAudioEncoderAttr(const AudioEncodeConfig &config) +void AudioEncoder::setEncAttrValue(const AudioEncodeConfig &config) { - if (!IsAudioCodecFormatSupported(config.audioFormat)) { - MEDIA_ERR_LOG("audioFormat:0x%x is not support", config.audioFormat); - return ERR_INVALID_PARAM; - } - if (!IsAudioSampleRateSupported(config.audioFormat, config.sampleRate)) { - MEDIA_ERR_LOG("audioFormat:%d is not support sampleRate:%d", config.audioFormat, config.sampleRate); - return ERR_INVALID_PARAM; - } uint32_t paramIndex = 0; domainKind_ = AUDIO_ENCODER; encAttr_[paramIndex].key = KEY_CODEC_TYPE; @@ -169,6 +161,20 @@ int32_t AudioEncoder::InitAudioEncoderAttr(const AudioEncodeConfig &config) encAttr_[paramIndex].key = KEY_BUFFERSIZE; encAttr_[paramIndex].val = &bufSize_; encAttr_[paramIndex].size = sizeof(uint32_t); +} + +int32_t AudioEncoder::InitAudioEncoderAttr(const AudioEncodeConfig &config) +{ + if (!IsAudioCodecFormatSupported(config.audioFormat)) { + MEDIA_ERR_LOG("audioFormat:0x%x is not support", config.audioFormat); + return ERR_INVALID_PARAM; + } + if (!IsAudioSampleRateSupported(config.audioFormat, config.sampleRate)) { + MEDIA_ERR_LOG("audioFormat:%d is not support sampleRate:%d", config.audioFormat, config.sampleRate); + return ERR_INVALID_PARAM; + } + setEncAttrValue(config); + return SUCCESS; } diff --git a/services/impl/audio_encoder/include/audio_encoder.h b/services/impl/audio_encoder/include/audio_encoder.h index 5be039f..69b398a 100644 --- a/services/impl/audio_encoder/include/audio_encoder.h +++ b/services/impl/audio_encoder/include/audio_encoder.h @@ -122,6 +122,7 @@ public: private: int32_t InitAudioEncoderAttr(const AudioEncodeConfig &config); + void setEncAttrValue(const AudioEncodeConfig &config); private: bool initialized_; diff --git a/services/server/src/audio_capturer_server.cpp b/services/server/src/audio_capturer_server.cpp index 53c965c..512156f 100644 --- a/services/server/src/audio_capturer_server.cpp +++ b/services/server/src/audio_capturer_server.cpp @@ -303,7 +303,6 @@ void AudioCapturerServer::SetSurface(IpcIo *req, IpcIo *reply) void AudioCapturerServer::Dispatch(int32_t funcId, pid_t pid, IpcIo *req, IpcIo *reply) { - int32_t ret; if (funcId == AUD_CAP_FUNC_GET_MIN_FRAME_COUNT) { return; } @@ -340,8 +339,7 @@ void AudioCapturerServer::Dispatch(int32_t funcId, pid_t pid, IpcIo *req, IpcIo Stop(capturer, reply); break; case AUD_CAP_FUNC_RELEASE: - ret = capturer->Release(); - WriteInt32(reply, ret); + WriteInt32(reply, static_cast(capturer->Release())); break; case AUD_CAP_FUNC_SET_SURFACE: SetSurface(req, reply); -- Gitee