openharmony/multimedia_av_codec
1
0
Fork 0
mirror of https://gitee.com/openharmony/multimedia_av_codec synced 2024-12-02 12:27:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

start异常处理和index范围的修改

Browse Source 
Signed-off-by: peng <yangpeng43@huawei.com>
This commit is contained in:
peng 2024-08-08 08:18:51 +00:00
parent e6493c40fd
commit 2bedf80d3a
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frameworks/native/avcodec/avcodec_audio_codec_impl.cpp
View File

@ -30,6 +30,7 @@ const std::string_view ASYNC_OUTPUT_FRAME = "OS_ACodecOut";
constexpr uint8_t LOGD_FREQUENCY = 5;
constexpr uint8_t TIME_OUT_MS = 50;
constexpr uint32_t DEFAULT_TRY_DECODE_TIME = 1000;
constexpr uint32_t MAX_INDEX = 1000000000;
constexpr int64_t MILLISECONDS = 100;
} // namespace
@ -90,7 +91,7 @@ int32_t AVCodecAudioCodecImpl::Prepare()
implProducer_ = implBufferQueue_->GetProducer();
codecService_->SetOutputBufferQueue(implProducer_);
int32_t ret = codecService_->Prepare();
CHECK_AND_RETURN_RET_LOG_LIMIT(ret != AVCS_ERR_INVALID_OPERATION, AVCS_ERR_OK,
CHECK_AND_RETURN_RET_LOG_LIMIT(ret != AVCS_ERR_TRY_AGAIN, AVCS_ERR_OK,
LOGD_FREQUENCY, "no need prepare");
CHECK_AND_RETURN_RET_LOG(ret == 0, AVCS_ERR_INVALID_STATE, "prepare fail, ret:%{public}d", ret);
@ -112,6 +113,7 @@ int32_t AVCodecAudioCodecImpl::Start()
CHECK_AND_RETURN_RET_LOG(Prepare() == AVCS_ERR_OK, AVCS_ERR_INVALID_STATE, "Prepare failed");
CHECK_AND_RETURN_RET_LOG(codecService_ != nullptr, AVCS_ERR_INVALID_STATE, "service died");
int32_t ret = codecService_->Start();
CHECK_AND_RETURN_RET_LOG(ret == 0, ret, "Start failed, ret:%{public}d", ret);
isRunning_ = true;
indexInput_ = 0;
indexOutput_ = 0;
@ -335,7 +337,7 @@ void AVCodecAudioCodecImpl::ProduceInputBuffer()
}
CHECK_AND_CONTINUE_LOG(callback_ != nullptr, "callback is nullptr");
callback_->OnInputBufferAvailable(indexInput_, emptyBuffer);
indexInput_++;
indexInput_ = (indexInput_ >= MAX_INDEX) ? 0 : ++indexInput_;
}
inputCondition_.wait_for(lock2, std::chrono::milliseconds(MILLISECONDS),
@ -498,7 +500,7 @@ void AVCodecAudioCodecImpl::AVCodecInnerCallback::OnOutputBufferAvailable(uint32
impl_->outputBufferObjMap_[impl_->indexOutput_] = buffer;
}
impl_->callback_->OnOutputBufferAvailable(impl_->indexOutput_, buffer);
impl_->indexOutput_++;
impl_->indexOutput_ = (impl_->indexOutput_ >= MAX_INDEX) ? 0 : ++impl_->indexOutput_;
}
}
} // namespace MediaAVCodec

4
frameworks/native/avcodec/avcodec_audio_codec_impl.h
View File

@ -92,8 +92,8 @@ private:
std::mutex outputMutex_;
std::mutex outputMutex_2;
std::atomic<int32_t> bufferConsumerAvailableCount_ = 0;
std::atomic<int32_t> indexInput_ = 0;
std::atomic<int32_t> indexOutput_ = 0;
std::atomic<uint32_t> indexInput_ = 0;
std::atomic<uint32_t> indexOutput_ = 0;
int32_t inputBufferSize_ = 0;
std::queue<std::shared_ptr<AVBuffer>> inputIndexQueue;
std::unordered_map<uint32_t, std::shared_ptr<AVBuffer>> inputBufferObjMap_;

2
services/media_engine/modules/media_codec/media_codec.cpp
View File

@ -198,7 +198,7 @@ int32_t MediaCodec::Prepare()
MEDIA_LOG_I("Prepare enter");
AutoLock lock(stateMutex_);
MediaAVCodec::AVCodecTrace trace("MediaCodec::Prepare");
FALSE_RETURN_V_MSG_W(state_ != CodecState::FLUSHED, (int32_t)Status::ERROR_WRONG_STATE,
FALSE_RETURN_V_MSG_W(state_ != CodecState::FLUSHED, (int32_t)Status::ERROR_AGAIN,
"state is flushed, no need prepare");
FALSE_RETURN_V(state_ != CodecState::PREPARED, (int32_t)Status::OK);
FALSE_RETURN_V(state_ == CodecState::CONFIGURED,