diff --git a/av_transport/av_trans_engine/av_receiver/include/av_audio_receiver_engine.h b/av_transport/av_trans_engine/av_receiver/include/av_audio_receiver_engine.h index 6f8dad5f3cc97da747a1729be3831781973fd3ad..da7a486c74a505c815b9b988c33b5f050883fcdb 100644 --- a/av_transport/av_trans_engine/av_receiver/include/av_audio_receiver_engine.h +++ b/av_transport/av_trans_engine/av_receiver/include/av_audio_receiver_engine.h @@ -74,6 +74,7 @@ private: int32_t InitControlCenter(); int32_t PreparePipeline(const std::string &configParam); int32_t HandleOutputBuffer(std::shared_ptr &hisBuffer); + bool ConvertToInt(const std::string& str, int& value); void RegRespFunMap(); void SetVideoWidth(const std::string &value); diff --git a/av_transport/av_trans_engine/av_receiver/src/av_audio_receiver_engine.cpp b/av_transport/av_trans_engine/av_receiver/src/av_audio_receiver_engine.cpp index 794cd95810adc7689ac8a5881d2075c81d307983..20dbecc774f81add8a86aa52447e6a2ac6896f4d 100644 --- a/av_transport/av_trans_engine/av_receiver/src/av_audio_receiver_engine.cpp +++ b/av_transport/av_trans_engine/av_receiver/src/av_audio_receiver_engine.cpp @@ -15,6 +15,8 @@ #include "av_audio_receiver_engine.h" +#include + namespace OHOS { namespace DistributedHardware { #undef DH_LOG_TAG @@ -256,6 +258,12 @@ int32_t AVAudioReceiverEngine::Release() return DH_AVT_SUCCESS; } +bool AVAudioReceiverEngine::ConvertToInt(const std::string& str, int& value) +{ + auto [ptr, ec] = std::from_chars(str.data(), str.data() + str.size(), value); + return ec == std::errc{} && ptr == str.data() + str.size(); +} + void AVAudioReceiverEngine::SetParameterInner(AVTransTag tag, const std::string &value) { switch (tag) { @@ -367,8 +375,13 @@ void AVAudioReceiverEngine::SetVideoWidth(const std::string &value) AVTRANS_LOGE("meta_ is nullptr."); return; } - meta_->SetData(Media::Tag::VIDEO_WIDTH, std::stoi(value)); - AVTRANS_LOGI("SetParameter VIDEO_WIDTH success, video width = %{public}s", value.c_str()); + int intValue = 0; + if (ConvertToInt(value, intValue)) { + meta_->SetData(Media::Tag::VIDEO_WIDTH, intValue); + AVTRANS_LOGI("SetParameter VIDEO_WIDTH success, video width = %{public}s", value.c_str()); + } else { + AVTRANS_LOGI("SetParameter VIDEO_WIDTH failed, value conversion failed."); + } } void AVAudioReceiverEngine::SetVideoHeight(const std::string &value) @@ -377,8 +390,13 @@ void AVAudioReceiverEngine::SetVideoHeight(const std::string &value) AVTRANS_LOGE("meta_ is nullptr."); return; } - meta_->SetData(Media::Tag::VIDEO_HEIGHT, std::stoi(value)); - AVTRANS_LOGI("SetParameter VIDEO_HEIGHT success, video height = %{public}s", value.c_str()); + int intValue = 0; + if (ConvertToInt(value, intValue)) { + meta_->SetData(Media::Tag::VIDEO_HEIGHT, intValue); + AVTRANS_LOGI("SetParameter VIDEO_HEIGHT success, video height = %{public}s", value.c_str()); + } else { + AVTRANS_LOGI("SetParameter VIDEO_HEIGHT failed, value conversion failed."); + } } void AVAudioReceiverEngine::SetVideoFrameRate(const std::string &value) @@ -387,8 +405,13 @@ void AVAudioReceiverEngine::SetVideoFrameRate(const std::string &value) AVTRANS_LOGE("meta_ is nullptr."); return; } - meta_->SetData(Media::Tag::VIDEO_FRAME_RATE, std::stoi(value)); - AVTRANS_LOGI("SetParameter VIDEO_FRAME_RATE success, frame rate = %{public}s", value.c_str()); + int intValue = 0; + if (ConvertToInt(value, intValue)) { + meta_->SetData(Media::Tag::VIDEO_FRAME_RATE, intValue); + AVTRANS_LOGI("SetParameter VIDEO_FRAME_RATE success, frame rate = %{public}s", value.c_str()); + } else { + AVTRANS_LOGI("SetParameter VIDEO_FRAME_RATE failed, value conversion failed."); + } } void AVAudioReceiverEngine::SetAudioBitRate(const std::string &value) @@ -397,8 +420,13 @@ void AVAudioReceiverEngine::SetAudioBitRate(const std::string &value) AVTRANS_LOGE("meta_ is nullptr."); return; } - meta_->SetData(Media::Tag::MEDIA_BITRATE, std::stoi(value)); - AVTRANS_LOGI("SetParameter MEDIA_BITRATE success, bit rate = %{public}s", value.c_str()); + int intValue = 0; + if (ConvertToInt(value, intValue)) { + meta_->SetData(Media::Tag::MEDIA_BITRATE, intValue); + AVTRANS_LOGI("SetParameter MEDIA_BITRATE success, bit rate = %{public}s", value.c_str()); + } else { + AVTRANS_LOGI("SetParameter MEDIA_BITRATE failed, value conversion failed."); + } } void AVAudioReceiverEngine::SetVideoBitRate(const std::string &value) @@ -407,8 +435,13 @@ void AVAudioReceiverEngine::SetVideoBitRate(const std::string &value) AVTRANS_LOGE("meta_ is nullptr."); return; } - meta_->SetData(Media::Tag::MEDIA_BITRATE, std::stoi(value)); - AVTRANS_LOGI("SetParameter MEDIA_BITRATE success, bit rate = %{public}s", value.c_str()); + int intValue = 0; + if (ConvertToInt(value, intValue)) { + meta_->SetData(Media::Tag::MEDIA_BITRATE, intValue); + AVTRANS_LOGI("SetParameter MEDIA_BITRATE success, bit rate = %{public}s", value.c_str()); + } else { + AVTRANS_LOGI("SetParameter MEDIA_BITRATE failed, value conversion failed."); + } } void AVAudioReceiverEngine::SetVideoCodecType(const std::string &value) @@ -426,7 +459,12 @@ void AVAudioReceiverEngine::SetAudioCodecType(const std::string &value) AVTRANS_LOGE("meta_ is nullptr."); return; } - meta_->SetData(Media::Tag::MIME_TYPE, std::stoi(value)); + int intValue = 0; + if (ConvertToInt(value, intValue)) { + meta_->SetData(Media::Tag::MIME_TYPE, intValue); + } else { + AVTRANS_LOGI("SetParameter MIME_TYPE failed, value conversion failed."); + } } void AVAudioReceiverEngine::SetAudioChannelMask(const std::string &value) @@ -435,8 +473,13 @@ void AVAudioReceiverEngine::SetAudioChannelMask(const std::string &value) AVTRANS_LOGE("meta_ is nullptr."); return; } - meta_->SetData(Media::Tag::AUDIO_CHANNEL_COUNT, std::stoi(value)); - AVTRANS_LOGI("SetParameter AUDIO_CHANNELS success, audio channels = %{public}s", value.c_str()); + int intValue = 0; + if (ConvertToInt(value, intValue)) { + meta_->SetData(Media::Tag::AUDIO_CHANNEL_COUNT, intValue); + AVTRANS_LOGI("SetParameter AUDIO_CHANNELS success, audio channels = %{public}s", value.c_str()); + } else { + AVTRANS_LOGI("SetParameter AUDIO_CHANNEL_COUNT failed, value conversion failed."); + } } void AVAudioReceiverEngine::SetAudioSampleRate(const std::string &value) @@ -445,8 +488,13 @@ void AVAudioReceiverEngine::SetAudioSampleRate(const std::string &value) AVTRANS_LOGE("meta_ is nullptr."); return; } - meta_->SetData(Media::Tag::AUDIO_SAMPLE_RATE, std::stoi(value)); - AVTRANS_LOGI("SetParameter AUDIO_SAMPLE_RATE success, audio sample rate = %{public}s", value.c_str()); + int intValue = 0; + if (ConvertToInt(value, intValue)) { + meta_->SetData(Media::Tag::AUDIO_SAMPLE_RATE, intValue); + AVTRANS_LOGI("SetParameter AUDIO_SAMPLE_RATE success, audio sample rate = %{public}s", value.c_str()); + } else { + AVTRANS_LOGI("SetParameter AUDIO_SAMPLE_RATE failed, value conversion failed."); + } } void AVAudioReceiverEngine::SetAudioChannelLayout(const std::string &value) @@ -455,8 +503,13 @@ void AVAudioReceiverEngine::SetAudioChannelLayout(const std::string &value) AVTRANS_LOGE("avInput_ or avOutput_ is nullptr."); return; } - meta_->SetData(Media::Tag::AUDIO_CHANNEL_LAYOUT, std::stoi(value)); - AVTRANS_LOGI("SetParameter AUDIO_CHANNEL_LAYOUT success, audio channel layout = %{public}s", value.c_str()); + int intValue = 0; + if (ConvertToInt(value, intValue)) { + meta_->SetData(Media::Tag::AUDIO_CHANNEL_LAYOUT, intValue); + AVTRANS_LOGI("SetParameter AUDIO_CHANNEL_LAYOUT success, audio channel layout = %{public}s", value.c_str()); + } else { + AVTRANS_LOGI("SetParameter AUDIO_CHANNEL_LAYOUT failed, value conversion failed."); + } } void AVAudioReceiverEngine::SetAudioSampleFormat(const std::string &value) @@ -465,9 +518,14 @@ void AVAudioReceiverEngine::SetAudioSampleFormat(const std::string &value) AVTRANS_LOGE("meta_ is nullptr."); return; } - auto sampleFormat = static_cast(std::stoi(value)); - meta_->SetData(Media::Tag::AUDIO_SAMPLE_FORMAT, sampleFormat); - AVTRANS_LOGI("SetParameter AUDIO_SAMPLE_FORMAT success, audio sample format = %{public}s", value.c_str()); + int intValue = 0; + if (ConvertToInt(value, intValue)) { + auto sampleFormat = static_cast(intValue); + meta_->SetData(Media::Tag::AUDIO_SAMPLE_FORMAT, sampleFormat); + AVTRANS_LOGI("SetParameter AUDIO_SAMPLE_FORMAT success, audio sample format = %{public}s", value.c_str()); + } else { + AVTRANS_LOGI("SetParameter AUDIO_SAMPLE_FORMAT failed, value conversion failed."); + } } void AVAudioReceiverEngine::SetAudioFrameSize(const std::string &value) @@ -476,8 +534,14 @@ void AVAudioReceiverEngine::SetAudioFrameSize(const std::string &value) AVTRANS_LOGE("meta_ is nullptr."); return; } - meta_->SetData(Media::Tag::AUDIO_SAMPLE_PER_FRAME, std::stoi(value)); - AVTRANS_LOGI("SetParameter AUDIO_SAMPLE_PER_FRAME success, audio sample per frame = %{public}s", value.c_str()); + int intValue = 0; + if (ConvertToInt(value, intValue)) { + meta_->SetData(Media::Tag::AUDIO_SAMPLE_PER_FRAME, intValue); + AVTRANS_LOGI("SetParameter AUDIO_SAMPLE_PER_FRAME success, audio sample per frame = %{public}s", + value.c_str()); + } else { + AVTRANS_LOGI("SetParameter AUDIO_SAMPLE_PER_FRAME failed, value conversion failed."); + } } void AVAudioReceiverEngine::SetSyncResult(const std::string &value) diff --git a/av_transport/av_trans_engine/av_sender/include/av_audio_sender_engine.h b/av_transport/av_trans_engine/av_sender/include/av_audio_sender_engine.h index 4d6321bf50a00c9c01e4582df43039f15302153b..b0552bcbdd88efebcebe3e708c853ee079851f79 100644 --- a/av_transport/av_trans_engine/av_sender/include/av_audio_sender_engine.h +++ b/av_transport/av_trans_engine/av_sender/include/av_audio_sender_engine.h @@ -78,6 +78,7 @@ private: int32_t InitControlCenter(); int32_t PreparePipeline(const std::string &configParam); void NotifyStreamChange(EventType type); + bool ConvertToInt(const std::string& str, int& value); void RegRespFunMap(); void SetVideoWidth(const std::string &value); diff --git a/av_transport/av_trans_engine/av_sender/src/av_audio_sender_engine.cpp b/av_transport/av_trans_engine/av_sender/src/av_audio_sender_engine.cpp index f87c9b58bec0a888143f225e8c3b1537550edef3..7e59e038b07bcdcc401d4f34cae1d0cea00334ba 100644 --- a/av_transport/av_trans_engine/av_sender/src/av_audio_sender_engine.cpp +++ b/av_transport/av_trans_engine/av_sender/src/av_audio_sender_engine.cpp @@ -15,6 +15,8 @@ #include "av_audio_sender_engine.h" +#include + namespace OHOS { namespace DistributedHardware { @@ -353,6 +355,12 @@ int32_t AVAudioSenderEngine::SetParameter(AVTransTag tag, const std::string &val return DH_AVT_SUCCESS; } +bool AVAudioSenderEngine::ConvertToInt(const std::string& str, int& value) +{ + auto [ptr, ec] = std::from_chars(str.data(), str.data() + str.size(), value); + return ec == std::errc{} && ptr == str.data() + str.size(); +} + void AVAudioSenderEngine::RegRespFunMap() { funcMap_[AVTransTag::VIDEO_WIDTH] = &AVAudioSenderEngine::SetVideoWidth; @@ -380,8 +388,13 @@ void AVAudioSenderEngine::SetVideoWidth(const std::string &value) AVTRANS_LOGE("meta_ is nullptr."); return; } - meta_->SetData(Media::Tag::VIDEO_WIDTH, std::stoi(value)); - AVTRANS_LOGI("SetParameter VIDEO_WIDTH success, video width = %{public}s", value.c_str()); + int intValue = 0; + if (ConvertToInt(value, intValue)) { + meta_->SetData(Media::Tag::VIDEO_WIDTH, intValue); + AVTRANS_LOGI("SetParameter VIDEO_WIDTH success, video width = %{public}s", value.c_str()); + } else { + AVTRANS_LOGI("SetParameter VIDEO_WIDTH failed, value conversion failed."); + } } void AVAudioSenderEngine::SetVideoHeight(const std::string &value) @@ -390,8 +403,13 @@ void AVAudioSenderEngine::SetVideoHeight(const std::string &value) AVTRANS_LOGE("meta_ is nullptr."); return; } - meta_->SetData(Media::Tag::VIDEO_HEIGHT, std::stoi(value)); - AVTRANS_LOGI("SetParameter VIDEO_HEIGHT success, video height = %{public}s", value.c_str()); + int intValue = 0; + if (ConvertToInt(value, intValue)) { + meta_->SetData(Media::Tag::VIDEO_HEIGHT, intValue); + AVTRANS_LOGI("SetParameter VIDEO_HEIGHT success, video height = %{public}s", value.c_str()); + } else { + AVTRANS_LOGI("SetParameter VIDEO_HEIGHT failed, value conversion failed."); + } } void AVAudioSenderEngine::SetVideoPixelFormat(const std::string &value) @@ -400,8 +418,13 @@ void AVAudioSenderEngine::SetVideoPixelFormat(const std::string &value) AVTRANS_LOGE("avInput_ is nullptr."); return; } - meta_->SetData(Media::Tag::VIDEO_PIXEL_FORMAT, std::stoi(value)); - AVTRANS_LOGI("SetParameter VIDEO_PIXEL_FORMAT success, pixel format = %{public}s", value.c_str()); + int intValue = 0; + if (ConvertToInt(value, intValue)) { + meta_->SetData(Media::Tag::VIDEO_PIXEL_FORMAT, intValue); + AVTRANS_LOGI("SetParameter VIDEO_PIXEL_FORMAT success, pixel format = %{public}s", value.c_str()); + } else { + AVTRANS_LOGI("SetParameter VIDEO_PIXEL_FORMAT failed, value conversion failed."); + } } void AVAudioSenderEngine::SetVideoFrameRate(const std::string &value) @@ -410,8 +433,13 @@ void AVAudioSenderEngine::SetVideoFrameRate(const std::string &value) AVTRANS_LOGE("meta_ is nullptr."); return; } - meta_->SetData(Media::Tag::VIDEO_FRAME_RATE, std::stoi(value)); - AVTRANS_LOGI("SetParameter VIDEO_FRAME_RATE success, frame rate = %{public}s", value.c_str()); + int intValue = 0; + if (ConvertToInt(value, intValue)) { + meta_->SetData(Media::Tag::VIDEO_FRAME_RATE, intValue); + AVTRANS_LOGI("SetParameter VIDEO_FRAME_RATE success, frame rate = %{public}s", value.c_str()); + } else { + AVTRANS_LOGI("SetParameter VIDEO_FRAME_RATE failed, value conversion failed."); + } } void AVAudioSenderEngine::SetAudioBitRate(const std::string &value) @@ -420,8 +448,13 @@ void AVAudioSenderEngine::SetAudioBitRate(const std::string &value) AVTRANS_LOGE("meta_ is nullptr."); return; } - meta_->SetData(Media::Tag::MEDIA_BITRATE, std::stoi(value)); - AVTRANS_LOGI("SetParameter MEDIA_BITRATE success, bit rate = %{public}s", value.c_str()); + int intValue = 0; + if (ConvertToInt(value, intValue)) { + meta_->SetData(Media::Tag::MEDIA_BITRATE, intValue); + AVTRANS_LOGI("SetParameter MEDIA_BITRATE success, bit rate = %{public}s", value.c_str()); + } else { + AVTRANS_LOGI("SetParameter MEDIA_BITRATE failed, value conversion failed."); + } } void AVAudioSenderEngine::SetVideoBitRate(const std::string &value) @@ -430,8 +463,13 @@ void AVAudioSenderEngine::SetVideoBitRate(const std::string &value) AVTRANS_LOGE("meta_ is nullptr."); return; } - meta_->SetData(Media::Tag::MEDIA_BITRATE, std::stoi(value)); - AVTRANS_LOGI("SetParameter MEDIA_BITRATE success, bit rate = %{public}s", value.c_str()); + int intValue = 0; + if (ConvertToInt(value, intValue)) { + meta_->SetData(Media::Tag::MEDIA_BITRATE, intValue); + AVTRANS_LOGI("SetParameter MEDIA_BITRATE success, bit rate = %{public}s", value.c_str()); + } else { + AVTRANS_LOGI("SetParameter MEDIA_BITRATE failed, value conversion failed."); + } } void AVAudioSenderEngine::SetVideoCodecType(const std::string &value) @@ -449,7 +487,12 @@ void AVAudioSenderEngine::SetAudioCodecType(const std::string &value) AVTRANS_LOGE("meta_ is nullptr."); return; } - meta_->SetData(Media::Tag::MIME_TYPE, std::stoi(value)); + int intValue = 0; + if (ConvertToInt(value, intValue)) { + meta_->SetData(Media::Tag::MIME_TYPE, intValue); + } else { + AVTRANS_LOGI("SetParameter MEDIA_BITRATE failed, value conversion failed."); + } } void AVAudioSenderEngine::SetAudioChannelMask(const std::string &value) @@ -458,8 +501,13 @@ void AVAudioSenderEngine::SetAudioChannelMask(const std::string &value) AVTRANS_LOGE("meta_ is nullptr."); return; } - meta_->SetData(Media::Tag::AUDIO_CHANNEL_COUNT, std::stoi(value)); - AVTRANS_LOGI("SetParameter AUDIO_CHANNELS success, audio channels = %{public}s", value.c_str()); + int intValue = 0; + if (ConvertToInt(value, intValue)) { + meta_->SetData(Media::Tag::AUDIO_CHANNEL_COUNT, intValue); + AVTRANS_LOGI("SetParameter AUDIO_CHANNELS success, audio channels = %{public}s", value.c_str()); + } else { + AVTRANS_LOGI("SetParameter AUDIO_CHANNEL_COUNT failed, value conversion failed."); + } } void AVAudioSenderEngine::SetAudioSampleRate(const std::string &value) @@ -468,8 +516,13 @@ void AVAudioSenderEngine::SetAudioSampleRate(const std::string &value) AVTRANS_LOGE("meta_ is nullptr."); return; } - meta_->SetData(Media::Tag::AUDIO_SAMPLE_RATE, std::stoi(value)); - AVTRANS_LOGI("SetParameter AUDIO_SAMPLE_RATE success, audio sample rate = %{public}s", value.c_str()); + int intValue = 0; + if (ConvertToInt(value, intValue)) { + meta_->SetData(Media::Tag::AUDIO_SAMPLE_RATE, intValue); + AVTRANS_LOGI("SetParameter AUDIO_SAMPLE_RATE success, audio sample = %{public}s", value.c_str()); + } else { + AVTRANS_LOGI("SetParameter AUDIO_SAMPLE_RATE failed, value conversion failed."); + } } void AVAudioSenderEngine::SetAudioChannelLayout(const std::string &value) @@ -478,8 +531,13 @@ void AVAudioSenderEngine::SetAudioChannelLayout(const std::string &value) AVTRANS_LOGE("avInput_ or avOutput_ is nullptr."); return; } - meta_->SetData(Media::Tag::AUDIO_CHANNEL_LAYOUT, std::stoi(value)); - AVTRANS_LOGI("SetParameter AUDIO_CHANNEL_LAYOUT success, audio channel layout = %{public}s", value.c_str()); + int intValue = 0; + if (ConvertToInt(value, intValue)) { + meta_->SetData(Media::Tag::AUDIO_CHANNEL_LAYOUT, intValue); + AVTRANS_LOGI("SetParameter AUDIO_CHANNEL_LAYOUT success, audio channel layout = %{public}s", value.c_str()); + } else { + AVTRANS_LOGI("SetParameter AUDIO_CHANNEL_LAYOUT failed, value conversion failed."); + } } void AVAudioSenderEngine::SetAudioSampleFormat(const std::string &value) @@ -488,9 +546,14 @@ void AVAudioSenderEngine::SetAudioSampleFormat(const std::string &value) AVTRANS_LOGE("meta_ is nullptr."); return; } - auto sampleFormat = static_cast(std::stoi(value)); - meta_->SetData(Media::Tag::AUDIO_SAMPLE_FORMAT, sampleFormat); - AVTRANS_LOGI("SetParameter AUDIO_SAMPLE_FORMAT success, audio sample format = %{public}s", value.c_str()); + int intValue = 0; + if (ConvertToInt(value, intValue)) { + auto sampleFormat = static_cast(intValue); + meta_->SetData(Media::Tag::AUDIO_SAMPLE_FORMAT, sampleFormat); + AVTRANS_LOGI("SetParameter AUDIO_SAMPLE_FORMAT success, audio sample format = %{public}s", value.c_str()); + } else { + AVTRANS_LOGI("SetParameter AUDIO_SAMPLE_FORMAT failed, value conversion failed."); + } } void AVAudioSenderEngine::SetAudioFrameSize(const std::string &value) @@ -499,8 +562,14 @@ void AVAudioSenderEngine::SetAudioFrameSize(const std::string &value) AVTRANS_LOGE("meta_ is nullptr."); return; } - meta_->SetData(Media::Tag::AUDIO_SAMPLE_PER_FRAME, std::stoi(value)); - AVTRANS_LOGI("SetParameter AUDIO_SAMPLE_PER_FRAME success, audio sample per frame = %{public}s", value.c_str()); + int intValue = 0; + if (ConvertToInt(value, intValue)) { + meta_->SetData(Media::Tag::AUDIO_SAMPLE_PER_FRAME, intValue); + AVTRANS_LOGI("SetParameter AUDIO_SAMPLE_PER_FRAME success, audio sample per frame = %{public}s", + value.c_str()); + } else { + AVTRANS_LOGI("SetParameter AUDIO_SAMPLE_PER_FRAME failed, value conversion failed."); + } } void AVAudioSenderEngine::SetSharedMemoryFd(const std::string &value) diff --git a/av_transport/av_trans_engine/filters/av_trans_coder/av_trans_audio_decoder_filter.h b/av_transport/av_trans_engine/filters/av_trans_coder/av_trans_audio_decoder_filter.h index 9fc7be5ae1e57abc2852b94fb511b00ce391d02e..fda8afec18700013449dc781742047db437dc55b 100644 --- a/av_transport/av_trans_engine/filters/av_trans_coder/av_trans_audio_decoder_filter.h +++ b/av_transport/av_trans_engine/filters/av_trans_coder/av_trans_audio_decoder_filter.h @@ -135,7 +135,7 @@ private: std::atomic isStoped_ = false; OH_AVFormat outputFormat_ = {}; - ADecInitParams initDecParams_; + ADecInitParams initDecParams_ = {}; OH_AVCodec *audioDecoder_ = nullptr; std::queue codecBufQueue_; std::queue codecIndexQueue_; diff --git a/av_transport/av_trans_engine/filters/av_trans_coder/av_trans_audio_encoder_filter.h b/av_transport/av_trans_engine/filters/av_trans_coder/av_trans_audio_encoder_filter.h index 775019f99a39427b038bb66b8545a5cc77d02ba6..8a3586da74a951e6f7ed908f12a65fc2a5241eb4 100644 --- a/av_transport/av_trans_engine/filters/av_trans_coder/av_trans_audio_encoder_filter.h +++ b/av_transport/av_trans_engine/filters/av_trans_coder/av_trans_audio_encoder_filter.h @@ -133,7 +133,7 @@ private: std::atomic isStoped_ = false; OH_AVFormat outputFormat_ = {}; - AEncInitParams initEncParams_; + AEncInitParams initEncParams_ = {}; OH_AVCodec *audioEncoder_ = nullptr; std::queue codecBufQueue_; std::queue codecIndexQueue_; diff --git a/av_transport/framework/filter/src/filter.cpp b/av_transport/framework/filter/src/filter.cpp index 805fccf93c2140991eb5733ff3cc4b9f4a831053..42286b68c2a0f618613a46bdc6dd2120e99e30ea 100644 --- a/av_transport/framework/filter/src/filter.cpp +++ b/av_transport/framework/filter/src/filter.cpp @@ -28,7 +28,7 @@ namespace OHOS { namespace DistributedHardware { namespace Pipeline { Filter::Filter(std::string name, FilterType type, bool isAsyncMode) - : name_(std::move(name)), filterType_(type), isAsyncMode_(isAsyncMode) + : name_(std::move(name)), filterType_(type), curState_(FilterState::ERROR), isAsyncMode_(isAsyncMode) { }