Version isolation and heif changes

Signed-off-by: chenzhaohui <chenzhaohui14@huawei.com>
Change-Id: I09d0615b9ac25ed648440899a8568607f1d642ff
This commit is contained in:
chenzhaohui 2024-12-09 17:39:16 +08:00
parent 71a09f58ad
commit 671de79349
2 changed files with 11 additions and 9 deletions

View File

@ -28,6 +28,7 @@
"components": [
"ability_runtime",
"access_token",
"bundle_framework",
"c_utils",
"graphic_2d",
"graphic_surface",
@ -53,6 +54,7 @@
"ffmpeg",
"astc-encoder",
"skia",
"samgr",
"resource_management",
"json",
"ffrt",

View File

@ -907,7 +907,7 @@ HWTEST_F(ImageSourceHeifTest, GetEncodedFormat001, TestSize.Level3)
*/
uint32_t errorCode = 0;
SourceOptions opts;
std::string IMAGE_ENCODEDFORMAT = ImageUtils::GetEncodedHeifFormat();
std::string imageEncodedFormat = ImageUtils::GetEncodedHeifFormat();
std::unique_ptr<ImageSource> imageSource = ImageSource::CreateImageSource(IMAGE_INPUT_HEIF_PATH, opts, errorCode);
ASSERT_EQ(errorCode, SUCCESS);
ASSERT_NE(imageSource.get(), nullptr);
@ -926,7 +926,7 @@ HWTEST_F(ImageSourceHeifTest, GetEncodedFormat001, TestSize.Level3)
ImageInfo imageinfo1;
uint32_t ret1 = imageSource->GetImageInfo(imageinfo1);
ASSERT_EQ(ret1, SUCCESS);
ASSERT_EQ(imageinfo1.encodedFormat, IMAGE_ENCODEDFORMAT);
ASSERT_EQ(imageinfo1.encodedFormat, imageEncodedFormat);
GTEST_LOG_(INFO) << "ImageSourceHeifTest: GetEncodedFormat001 imageinfo1: " << imageinfo1.encodedFormat;
/**
* @tc.steps: step4. get imageInfo encodedformat from pixelMap.
@ -935,7 +935,7 @@ HWTEST_F(ImageSourceHeifTest, GetEncodedFormat001, TestSize.Level3)
ImageInfo imageinfo2;
pixelMap->GetImageInfo(imageinfo2);
EXPECT_EQ(imageinfo2.encodedFormat.empty(), false);
ASSERT_EQ(imageinfo2.encodedFormat, IMAGE_ENCODEDFORMAT);
ASSERT_EQ(imageinfo2.encodedFormat, imageEncodedFormat);
GTEST_LOG_(INFO) << "ImageSourceHeifTest: GetEncodedFormat001 imageinfo2: " << imageinfo2.encodedFormat;
}
@ -952,7 +952,7 @@ HWTEST_F(ImageSourceHeifTest, GetEncodedFormat002, TestSize.Level3)
*/
uint32_t errorCode = 0;
SourceOptions opts;
std::string IMAGE_ENCODEDFORMAT = ImageUtils::GetEncodedHeifFormat();
std::string imageEncodedFormat = ImageUtils::GetEncodedHeifFormat();
opts.formatHint = "image/heif";
std::unique_ptr<ImageSource> imageSource = ImageSource::CreateImageSource(IMAGE_INPUT_HW_HEIF_PATH,
opts, errorCode);
@ -973,7 +973,7 @@ HWTEST_F(ImageSourceHeifTest, GetEncodedFormat002, TestSize.Level3)
ImageInfo imageinfo1;
uint32_t ret1 = imageSource->GetImageInfo(imageinfo1);
ASSERT_EQ(ret1, SUCCESS);
ASSERT_EQ(imageinfo1.encodedFormat, IMAGE_ENCODEDFORMAT);
ASSERT_EQ(imageinfo1.encodedFormat, imageEncodedFormat);
GTEST_LOG_(INFO) << "ImageSourceHeifTest: GetEncodedFormat002 imageinfo1: " << imageinfo1.encodedFormat;
/**
* @tc.steps: step4. get imageInfo encodedformat from pixelMap.
@ -982,7 +982,7 @@ HWTEST_F(ImageSourceHeifTest, GetEncodedFormat002, TestSize.Level3)
ImageInfo imageinfo2;
pixelMap->GetImageInfo(imageinfo2);
EXPECT_EQ(imageinfo2.encodedFormat.empty(), false);
ASSERT_EQ(imageinfo2.encodedFormat, IMAGE_ENCODEDFORMAT);
ASSERT_EQ(imageinfo2.encodedFormat, imageEncodedFormat);
GTEST_LOG_(INFO) << "ImageSourceHeifTest: GetEncodedFormat002 imageinfo2: " << imageinfo2.encodedFormat;
}
@ -999,7 +999,7 @@ HWTEST_F(ImageSourceHeifTest, GetEncodedFormat003, TestSize.Level3)
*/
uint32_t errorCode = 0;
SourceOptions opts;
std::string IMAGE_ENCODEDFORMAT = ImageUtils::GetEncodedHeifFormat();
std::string imageEncodedFormat = ImageUtils::GetEncodedHeifFormat();
std::unique_ptr<ImageSource> imageSource = ImageSource::CreateImageSource(IMAGE_INPUT_EXIF_HEIF_PATH,
opts, errorCode);
ASSERT_EQ(errorCode, SUCCESS);
@ -1011,7 +1011,7 @@ HWTEST_F(ImageSourceHeifTest, GetEncodedFormat003, TestSize.Level3)
ImageInfo imageinfo1;
uint32_t ret1 = imageSource->GetImageInfo(imageinfo1);
ASSERT_EQ(ret1, SUCCESS);
ASSERT_EQ(imageinfo1.encodedFormat, IMAGE_ENCODEDFORMAT);
ASSERT_EQ(imageinfo1.encodedFormat, imageEncodedFormat);
GTEST_LOG_(INFO) << "ImageSourceHeifTest: GetEncodedFormat003 imageinfo1: " << imageinfo1.encodedFormat;
/**
* @tc.steps: step3. decode image source to pixel map by default decode options.
@ -1028,7 +1028,7 @@ HWTEST_F(ImageSourceHeifTest, GetEncodedFormat003, TestSize.Level3)
ImageInfo imageinfo2;
pixelMap->GetImageInfo(imageinfo2);
EXPECT_EQ(imageinfo2.encodedFormat.empty(), false);
ASSERT_EQ(imageinfo2.encodedFormat, IMAGE_ENCODEDFORMAT);
ASSERT_EQ(imageinfo2.encodedFormat, imageEncodedFormat);
GTEST_LOG_(INFO) << "ImageSourceHeifTest: GetEncodedFormat003 imageinfo2: " << imageinfo2.encodedFormat;
}
} // namespace Multimedia