From d8a74abbaa55a96e2a80a044096583b0264b36d2 Mon Sep 17 00:00:00 2001 From: zhonglufu Date: Tue, 6 Aug 2024 09:49:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=A0=E8=BE=93=E7=BB=84=E4=BB=B6=E9=9F=B3?= =?UTF-8?q?=E9=A2=91=E6=8E=A5=E5=85=A5OPUS=E7=BC=96=E8=A7=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhonglufu --- .../av_receiver/src/av_receiver_engine.cpp | 8 ++++---- .../av_trans_engine/av_sender/src/av_sender_engine.cpp | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/av_transport/av_trans_engine/av_receiver/src/av_receiver_engine.cpp b/av_transport/av_trans_engine/av_receiver/src/av_receiver_engine.cpp index 029cb855..65244e1c 100644 --- a/av_transport/av_trans_engine/av_receiver/src/av_receiver_engine.cpp +++ b/av_transport/av_trans_engine/av_receiver/src/av_receiver_engine.cpp @@ -94,9 +94,9 @@ int32_t AVReceiverEngine::InitPipeline() } } else if ((ownerName_ == OWNER_NAME_D_MIC) || (ownerName_ == OWNER_NAME_D_SPEAKER) || (ownerName_ == OWNER_NAME_D_VIRMODEM_MIC) || (ownerName_ == OWNER_NAME_D_VIRMODEM_SPEAKER)) { - ret = pipeline_->AddFilters({avInput_.get(), avOutput_.get()}); + ret = pipeline_->AddFilters({avInput_.get(), audioDecoder_.get(), avOutput_.get()}); if (ret == ErrorCode::SUCCESS) { - ret = pipeline_->LinkFilters({avInput_.get(), avOutput_.get()}); + ret = pipeline_->LinkFilters({avInput_.get(), audioDecoder_.get(), avOutput_.get()}); } } else { AVTRANS_LOGI("unsupport ownerName:%{public}s", ownerName_.c_str()); @@ -425,11 +425,11 @@ void AVReceiverEngine::SetAudioCodecType(const std::string &value) AVTRANS_LOGE("avInput_ or avOutput_ is nullptr."); return; } - std::string mime = MEDIA_MIME_AUDIO_AAC; + std::string mime = MEDIA_MIME_AUDIO_OPUS; avInput_->SetParameter(static_cast(Plugin::Tag::MIME), mime); mime = MEDIA_MIME_AUDIO_RAW; avOutput_->SetParameter(static_cast(Plugin::Tag::MIME), mime); - AVTRANS_LOGI("SetParameter AUDIO_CODEC_TYPE = AAC success"); + AVTRANS_LOGI("SetParameter AUDIO_CODEC_TYPE = OPUS success"); } void AVReceiverEngine::SetAudioChannelMask(const std::string &value) diff --git a/av_transport/av_trans_engine/av_sender/src/av_sender_engine.cpp b/av_transport/av_trans_engine/av_sender/src/av_sender_engine.cpp index 69e4363d..252e3417 100644 --- a/av_transport/av_trans_engine/av_sender/src/av_sender_engine.cpp +++ b/av_transport/av_trans_engine/av_sender/src/av_sender_engine.cpp @@ -95,9 +95,9 @@ int32_t AVSenderEngine::InitPipeline() } } else if ((ownerName_ == OWNER_NAME_D_MIC) || (ownerName_ == OWNER_NAME_D_SPEAKER) || (ownerName_ == OWNER_NAME_D_VIRMODEM_MIC) || (ownerName_ == OWNER_NAME_D_VIRMODEM_SPEAKER)) { - ret = pipeline_->AddFilters({avInput_.get(), avOutput_.get()}); + ret = pipeline_->AddFilters({avInput_.get(), audioEncoder_.get(), avOutput_.get()}); if (ret == ErrorCode::SUCCESS) { - ret = pipeline_->LinkFilters({avInput_.get(), avOutput_.get()}); + ret = pipeline_->LinkFilters({avInput_.get(), audioEncoder_.get(), avOutput_.get()}); } } else { AVTRANS_LOGI("unsupport ownerName:%{public}s", ownerName_.c_str()); @@ -421,15 +421,15 @@ void AVSenderEngine::SetAudioCodecType(const std::string &value) return; } Plugin::Meta encoderMeta; - encoderMeta.Set(MEDIA_MIME_AUDIO_AAC); + encoderMeta.Set(MEDIA_MIME_AUDIO_OPUS); encoderMeta.Set(Plugin::AudioAacProfile::LC); audioEncoder_->SetAudioEncoder(0, std::make_shared(encoderMeta)); std::string mime = MEDIA_MIME_AUDIO_RAW; avInput_->SetParameter(static_cast(Plugin::Tag::MIME), mime); - mime = MEDIA_MIME_AUDIO_AAC; + mime = MEDIA_MIME_AUDIO_OPUS; avOutput_->SetParameter(static_cast(Plugin::Tag::MIME), mime); - AVTRANS_LOGI("SetParameter AUDIO_CODEC_TYPE = ACC success"); + AVTRANS_LOGI("SetParameter AUDIO_CODEC_TYPE = OPUS success"); } void AVSenderEngine::SetAudioChannelMask(const std::string &value) -- Gitee