openharmony/multimedia_av_codec
1
0
Fork 0
mirror of https://gitee.com/openharmony/multimedia_av_codec synced 2025-03-01 15:46:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

新增创建codeclist为空校验

Browse Source 
Signed-off-by: yangxiaoyu <yangxiaoyu5@huawei.com>
This commit is contained in:
yangxiaoyu 2024-01-29 02:53:22 +00:00
parent 99e2d44fae
commit 1732abd869
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
frameworks/native/capi/common/native_avcapability.cpp
View File

@ -34,6 +34,7 @@ OH_AVCapability *OH_AVCodec_GetCapability(const char *mime, bool isEncoder)
CHECK_AND_RETURN_RET_LOG(mime != nullptr, nullptr, "Get capability failed: mime is nullptr");
CHECK_AND_RETURN_RET_LOG(strlen(mime) != 0, nullptr, "Get capability failed: mime is empty");
std::shared_ptr<AVCodecList> codeclist = AVCodecListFactory::CreateAVCodecList();
CHECK_AND_RETURN_RET_LOG(codeclist != nullptr, nullptr, "Get capability failed: CreateAVCodecList failed");
uint32_t sizeOfCap = sizeof(OH_AVCapability);
CapabilityData *capabilityData = codeclist->GetCapability(mime, isEncoder, AVCodecCategory::AVCODEC_NONE);
CHECK_AND_RETURN_RET_LOG(capabilityData != nullptr, nullptr,
@ -57,6 +58,8 @@ OH_AVCapability *OH_AVCodec_GetCapabilityByCategory(const char *mime, bool isEnc
CHECK_AND_RETURN_RET_LOG(mime != nullptr, nullptr, "Get capabilityByCategory failed: mime is nullptr");
CHECK_AND_RETURN_RET_LOG(strlen(mime) != 0, nullptr, "Get capabilityByCategory failed: mime is empty");
std::shared_ptr<AVCodecList> codeclist = AVCodecListFactory::CreateAVCodecList();
CHECK_AND_RETURN_RET_LOG(codeclist != nullptr, nullptr,
"Get capabilityByCategory failed: CreateAVCodecList failed");
AVCodecCategory innerCategory;
if (category == HARDWARE) {
innerCategory = AVCodecCategory::AVCODEC_HARDWARE;
@ -130,6 +133,8 @@ OH_AVErrCode OH_AVCapability_GetSupportedProfiles(OH_AVCapability *capability, c
}
std::shared_ptr<AVCodecList> codeclist = AVCodecListFactory::CreateAVCodecList();
CHECK_AND_RETURN_RET_LOG(codeclist != nullptr, AV_ERR_UNKNOWN,
"Get supported profiles failed: CreateAVCodecList failed");
if (capability->profiles_ != nullptr) {
codeclist->DeleteBuffer(capability->profiles_);
capability->profiles_ = nullptr;
@ -169,6 +174,8 @@ OH_AVErrCode OH_AVCapability_GetSupportedLevelsForProfile(OH_AVCapability *capab
}
std::shared_ptr<AVCodecList> codeclist = AVCodecListFactory::CreateAVCodecList();
CHECK_AND_RETURN_RET_LOG(codeclist != nullptr, AV_ERR_UNKNOWN,
"Get supported levels for profile failed: CreateAVCodecList failed");
if (capability->levels_ != nullptr) {
codeclist->DeleteBuffer(capability->levels_);
capability->levels_ = nullptr;
@ -279,6 +286,8 @@ OH_AVErrCode OH_AVCapability_GetAudioSupportedSampleRates(OH_AVCapability *capab
}
std::shared_ptr<AVCodecList> codeclist = AVCodecListFactory::CreateAVCodecList();
CHECK_AND_RETURN_RET_LOG(codeclist != nullptr, AV_ERR_UNKNOWN,
"Get audio supported samplerates failed: CreateAVCodecList failed");
if (capability->sampleRates_ != nullptr) {
codeclist->DeleteBuffer(capability->sampleRates_);
capability->sampleRates_ = nullptr;
@ -331,6 +340,8 @@ OH_AVErrCode OH_AVCapability_GetVideoSupportedPixelFormats(OH_AVCapability *capa
}
std::shared_ptr<AVCodecList> codeclist = AVCodecListFactory::CreateAVCodecList();
CHECK_AND_RETURN_RET_LOG(codeclist != nullptr, AV_ERR_UNKNOWN,
"Get video supported pixel formats failed: CreateAVCodecList failed");
if (capability->pixFormats_ != nullptr) {
codeclist->DeleteBuffer(capability->pixFormats_);
capability->pixFormats_ = nullptr;

6
interfaces/inner_api/native/avcodec_list.h
View File

@ -53,9 +53,9 @@ public:
*/
virtual CapabilityData *GetCapability(const std::string &mime, const bool isEncoder,
const AVCodecCategory &category) = 0;
virtual void *GetBuffer(const std::string &name, uint32_t sizeOfCap);
virtual void *NewBuffer(size_t bufSize);
virtual void DeleteBuffer(void *bufAddr);
virtual void *GetBuffer(const std::string &name, uint32_t sizeOfCap) = 0;
virtual void *NewBuffer(size_t bufSize) = 0;
virtual void DeleteBuffer(void *bufAddr) = 0;
};
class __attribute__((visibility("default"))) AVCodecListFactory {