mirror of
https://gitee.com/openharmony/multimedia_image_framework
synced 2024-11-23 15:10:26 +00:00
Signed-off-by:fandongyu<fandongyu.30044153@huawei.com>
Signed-off-by: fandongyu <fandongyu.30044153@huawei.com>
This commit is contained in:
parent
a2fa421ee6
commit
3a762127e1
@ -403,6 +403,10 @@ bool ExtDecoder::GetScaledSize(int &dWidth, int &dHeight, float &scale)
|
||||
finalScale = Max(static_cast<float>(dWidth) / info_.width(),
|
||||
static_cast<float>(dHeight) / info_.height());
|
||||
}
|
||||
if (codec_ == nullptr) {
|
||||
IMAGE_LOGE("codec is null in GetScaledSize!");
|
||||
return false;
|
||||
}
|
||||
auto scaledDimension = codec_->getScaledDimensions(finalScale);
|
||||
dWidth = scaledDimension.width();
|
||||
dHeight = scaledDimension.height();
|
||||
@ -824,6 +828,10 @@ uint32_t ExtDecoder::Decode(uint32_t index, DecodeContext &context)
|
||||
return SUCCESS;
|
||||
}
|
||||
#endif
|
||||
uint32_t res = PreDecodeCheck(index);
|
||||
if (res != SUCCESS) {
|
||||
return res;
|
||||
}
|
||||
context.outInfo.size.width = static_cast<uint32_t>(dstInfo_.width());
|
||||
context.outInfo.size.height = static_cast<uint32_t>(dstInfo_.height());
|
||||
if (IsHeifToYuvDecode(context)) {
|
||||
@ -834,10 +842,6 @@ uint32_t ExtDecoder::Decode(uint32_t index, DecodeContext &context)
|
||||
context.isHardDecode = true;
|
||||
return DoHeifToSingleHdrDecode(context);
|
||||
}
|
||||
uint32_t res = PreDecodeCheck(index);
|
||||
if (res != SUCCESS) {
|
||||
return res;
|
||||
}
|
||||
SkEncodedImageFormat skEncodeFormat = codec_->getEncodedFormat();
|
||||
PixelFormat format = context.info.pixelFormat;
|
||||
bool isOutputYuv420Format = IsYuv420Format(context.info.pixelFormat);
|
||||
|
Loading…
Reference in New Issue
Block a user