diff --git a/frameworks/innerkitsimpl/codec/src/image_source.cpp b/frameworks/innerkitsimpl/codec/src/image_source.cpp index 0599377090f8c2fb48b79c187286e634ff495b7d..8d166d1e40ee533a11a8c9c11d57faadb8d856d7 100644 --- a/frameworks/innerkitsimpl/codec/src/image_source.cpp +++ b/frameworks/innerkitsimpl/codec/src/image_source.cpp @@ -1252,20 +1252,17 @@ uint32_t ImageSource::GetFormatExtended(string &format) uint32_t ImageSource::GetEncodedFormat(const string &formatHint, string &format) { - bool streamIncomplete = false; + uint32_t ret; auto hintIter = formatAgentMap_.end(); if (!formatHint.empty()) { - uint32_t ret = CheckFormatHint(formatHint, hintIter); - if (ret == ERR_IMAGE_SOURCE_DATA) { - HiLog::Error(LABEL, "[ImageSource]image source data error."); - return ret; - } else if (ret == SUCCESS) { + ret = CheckFormatHint(formatHint, hintIter); + if (ret == SUCCESS) { format = hintIter->first; HiLog::Debug(LABEL, "[ImageSource]check input image format success, format:%{public}s.", format.c_str()); return SUCCESS; - } else if (ret == ERR_IMAGE_SOURCE_DATA_INCOMPLETE) { - streamIncomplete = true; - HiLog::Error(LABEL, "[ImageSource]image source data error ERR_IMAGE_SOURCE_DATA_INCOMPLETE."); + } else { + HiLog::Error(LABEL, "[ImageSource]checkFormatHint error, type: %{public}d", ret); + return ret; } } @@ -1279,24 +1276,20 @@ uint32_t ImageSource::GetEncodedFormat(const string &formatHint, string &format) continue; // has been checked before. } AbsImageFormatAgent *agent = iter->second; - auto result = CheckEncodedFormat(*agent); - if (result == ERR_IMAGE_MISMATCHED_FORMAT) { + ret = CheckEncodedFormat(*agent); + if (ret == ERR_IMAGE_MISMATCHED_FORMAT) { continue; - } else if (result == SUCCESS) { + } else if (ret == SUCCESS) { HiLog::Info(LABEL, "[ImageSource]GetEncodedFormat success format :%{public}s.", iter->first.c_str()); format = iter->first; return SUCCESS; - } else if (result == ERR_IMAGE_SOURCE_DATA_INCOMPLETE) { - streamIncomplete = true; + } else { + HiLog::Error(LABEL, "[ImageSource]checkEncodedFormat error, type: %{public}d", ret); + return ret; } } - if (streamIncomplete) { - HiLog::Error(LABEL, "[ImageSource]image source incomplete."); - return ERR_IMAGE_SOURCE_DATA_INCOMPLETE; - } - - // default return raw image + // default return raw image, ERR_IMAGE_MISMATCHED_FORMAT case format = InnerFormat::RAW_FORMAT; HiLog::Info(LABEL, "[ImageSource]image default to raw format."); return SUCCESS;