mirror/kimageformats
1
0
Fork 0
mirror of https://invent.kde.org/frameworks/kimageformats.git synced 2025-05-28 00:30:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

avif: revert 9ac923ad09 commit

Browse Source 
Changes to libavif's avifImageRGBToYUV() API were reverted too.
This commit is contained in:
Daniel Novomeský 2022-10-11 14:36:17 +02:00
parent d2f38b8b9c
commit f475a4b24a
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/imageformats/avif.cpp
View File

@ -336,7 +336,7 @@ bool QAVIFHandler::decode_one_frame()
rgb.format = AVIF_RGB_FORMAT_ARGB;
#endif
#if (AVIF_VERSION >= 80400) && (AVIF_VERSION <= 100100)
#if AVIF_VERSION >= 80400
if (m_decoder->imageCount > 1) {
/* accelerate animated AVIF */
rgb.chromaUpsampling = AVIF_CHROMA_UPSAMPLING_FASTEST;
@ -351,12 +351,7 @@ bool QAVIFHandler::decode_one_frame()
rgb.rowBytes = result.bytesPerLine();
rgb.pixels = result.bits();
#if AVIF_VERSION >= 100101
// use faster decoding for animations
avifResult res = avifImageYUVToRGB(m_decoder->image, &rgb, (m_decoder->imageCount > 1) ? AVIF_CHROMA_UPSAMPLING_NEAREST : AVIF_YUV_TO_RGB_DEFAULT);
#else
avifResult res = avifImageYUVToRGB(m_decoder->image, &rgb);
#endif
if (res != AVIF_RESULT_OK) {
qWarning("ERROR in avifImageYUVToRGB: %s", avifResultToString(res));
return false;
@ -782,11 +777,7 @@ bool QAVIFHandler::write(const QImage &image)
}
}
#if AVIF_VERSION >= 100101
res = avifImageRGBToYUV(avif, &rgb, AVIF_RGB_TO_YUV_DEFAULT);
#else
res = avifImageRGBToYUV(avif, &rgb);
#endif
if (res != AVIF_RESULT_OK) {
qWarning("ERROR in avifImageRGBToYUV: %s", avifResultToString(res));
return false;