mirror of
https://gitee.com/openharmony/multimedia_image_framework
synced 2024-11-27 17:22:40 +00:00
make imageId_ non-static
Signed-off-by: y00656910 <yaoxingyu3@huawei.com> Change-Id: I7350a2b95503795b638e13bba01f413ec9c59607
This commit is contained in:
parent
c724a29b6f
commit
50c14538f8
@ -133,7 +133,6 @@ static const uint8_t ASTC_HEADER_DIM_Y = 10;
|
||||
|
||||
PluginServer &ImageSource::pluginServer_ = ImageUtils::GetPluginServer();
|
||||
ImageSource::FormatAgentMap ImageSource::formatAgentMap_ = InitClass();
|
||||
uint64_t ImageSource::imageId_ = 0;
|
||||
|
||||
uint32_t ImageSource::GetSupportedFormats(set<string> &formats)
|
||||
{
|
||||
@ -177,7 +176,6 @@ unique_ptr<ImageSource> ImageSource::DoImageSourceCreate(
|
||||
{
|
||||
ImageTrace imageTrace(traceName);
|
||||
HiLog::Debug(LABEL, "[ImageSource]DoImageSourceCreate IN.");
|
||||
imageId_ = GetNowTimeMicroSeconds() % NUM_ONE_MILLION;
|
||||
errorCode = ERR_IMAGE_SOURCE_DATA;
|
||||
auto streamPtr = stream();
|
||||
if (streamPtr == nullptr) {
|
||||
@ -1094,6 +1092,7 @@ ImageSource::ImageSource(unique_ptr<SourceStream> &&stream, const SourceOptions
|
||||
sourceOptions_.pixelFormat = opts.pixelFormat;
|
||||
sourceOptions_.size.width = opts.size.width;
|
||||
sourceOptions_.size.height = opts.size.height;
|
||||
imageId_ = GetNowTimeMicroSeconds() % NUM_ONE_MILLION;
|
||||
}
|
||||
|
||||
ImageSource::FormatAgentMap ImageSource::InitClass()
|
||||
|
@ -289,7 +289,7 @@ private:
|
||||
bool hasDesiredSizeOptions = false;
|
||||
MemoryUsagePreference preference_ = MemoryUsagePreference::DEFAULT;
|
||||
bool isAstc_ = false;
|
||||
static uint64_t imageId_; // generated from the last six bits of the current timestamp
|
||||
uint64_t imageId_; // generated from the last six bits of the current timestamp
|
||||
};
|
||||
} // namespace Media
|
||||
} // namespace OHOS
|
||||
|
Loading…
Reference in New Issue
Block a user