Skip to content

Commit 46e8331

Browse files
awxkeeawxkee
committed
Bug fixes
1 parent 304522b commit 46e8331

File tree

7 files changed

+59
-128
lines changed

7 files changed

+59
-128
lines changed

‎app/src/main/java/com/radzivon/bartoshyk/avif/MainActivity.kt‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ class MainActivity : AppCompatActivity() {
109109
buffer,
110110
size.width * 2,
111111
size.height * 2,
112-
PreferredColorConfig.RGBA_F16,
112+
PreferredColorConfig.RGB_565,
113113
ScaleMode.RESIZE
114114
)
115115
binding.imageView2.setImageBitmap(bitmap)
@@ -140,7 +140,7 @@ class MainActivity : AppCompatActivity() {
140140
buffer,
141141
size.width * 2,
142142
size.height * 2,
143-
PreferredColorConfig.RGBA_F16,
143+
PreferredColorConfig.RGB_565,
144144
ScaleMode.RESIZE
145145
)
146146
binding.imageView4.setImageBitmap(bitmap)
@@ -157,7 +157,7 @@ class MainActivity : AppCompatActivity() {
157157
buffer,
158158
size.width * 2,
159159
size.height * 2,
160-
PreferredColorConfig.HARDWARE,
160+
PreferredColorConfig.RGB_565,
161161
ScaleMode.RESIZE
162162
)
163163
binding.imageView5.setImageBitmap(bitmap)
@@ -239,7 +239,7 @@ class MainActivity : AppCompatActivity() {
239239
buffer,
240240
size.width,
241241
size.height,
242-
PreferredColorConfig.RGBA_F16,
242+
PreferredColorConfig.RGB_565,
243243
ScaleMode.RESIZE
244244
)
245245
binding.imageView11.setImageBitmap(bitmap)
@@ -248,7 +248,7 @@ class MainActivity : AppCompatActivity() {
248248
}
249249

250250
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
251-
val buffer = this.assets.open("alpha_t.avif").source().buffer().readByteArray()
251+
val buffer = this.assets.open("blue_lights.avif").source().buffer().readByteArray()
252252
val size = coder.getSize(buffer)!!
253253
assert(size != null)
254254
val executionTime = measureTimeMillis {
@@ -261,10 +261,10 @@ class MainActivity : AppCompatActivity() {
261261
Log.i("AVIF", "execution time $executionTime")
262262
}
263263

264-
//https://wh.aimuse.online/creatives/IMUSE_03617fe2db82a584166_27/TT_a9d21ff1061d785347935fef/68f06252.avif
265-
//https://wh.aimuse.online/preset/federico-beccari.avif
266-
// https://wh.aimuse.online/preset/avif10bit.avif
267-
264+
// https://wh.aimuse.online/creatives/IMUSE_03617fe2db82a584166_27/TT_a9d21ff1061d785347935fef/68f06252.avif
265+
// https://wh.aimuse.online/preset/federico-beccari.avif
266+
// https://wh.aimuse.online/preset/avif10bit.avif
267+
//
268268
// Glide.with(this)
269269
// .load("https://wh.aimuse.online/preset/federico-beccari.avif")
270270
// .skipMemoryCache(true)

‎avif-coder/src/main/cpp/JniBitmap.cpp‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -69,22 +69,24 @@ createBitmap(JNIEnv *env, std::vector<uint8_t> &data, std::string &colorConfig,
6969
}
7070

7171
if (colorConfig == "RGB_565") {
72-
coder::CopyUnalignedRGB565(reinterpret_cast<const uint8_t *>(data.data()), stride,
73-
reinterpret_cast<uint8_t *>(addr), (int) info.stride,
74-
(int) info.width,
75-
(int) info.height);
72+
coder::CopyUnaligned(reinterpret_cast<const uint8_t *>(data.data()), stride,
73+
reinterpret_cast<uint8_t *>(addr), (int) info.stride,
74+
(int) info.width,
75+
(int) info.height, 2);
7676
} else {
77+
int copyWidth = (int) info.width * 4;
7778
int pixelSize = 1;
7879
if (use16Floats) {
7980
pixelSize = 2;
8081
}
8182
if (colorConfig == "RGBA_1010102") {
8283
pixelSize = sizeof(uint32_t);
84+
copyWidth = (int) info.width;
8385
}
84-
coder::CopyUnalignedRGBA(reinterpret_cast<const uint8_t *>(data.data()), stride,
85-
reinterpret_cast<uint8_t *>(addr), (int) info.stride,
86-
(int) info.width,
87-
(int) info.height, pixelSize);
86+
coder::CopyUnaligned(reinterpret_cast<const uint8_t *>(data.data()), stride,
87+
reinterpret_cast<uint8_t *>(addr), (int) info.stride,
88+
copyWidth,
89+
(int) info.height, pixelSize);
8890
}
8991

9092
if (AndroidBitmap_unlockPixels(env, bitmapObj) != 0) {

‎avif-coder/src/main/cpp/ReformatBitmap.cpp‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ namespace coder {
170170
bufferDesc.layers = 1;
171171
bufferDesc.format = (*useFloats) ? AHARDWAREBUFFER_FORMAT_R16G16B16A16_FLOAT
172172
: AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM;
173+
173174
bufferDesc.usage = AHARDWAREBUFFER_USAGE_GPU_SAMPLED_IMAGE;
174175

175176
if (!*useFloats && !alphaPremultiplied) {
@@ -187,7 +188,7 @@ namespace coder {
187188
throw ReformatBitmapError(err);
188189
}
189190
ARect rect = {0, 0, imageWidth, imageHeight};
190-
uint8_t *buffer;
191+
uint8_t *buffer = nullptr;
191192

192193
status = AHardwareBuffer_lock_compat(hardwareBuffer,
193194
AHARDWAREBUFFER_USAGE_CPU_WRITE_OFTEN, -1,
@@ -201,9 +202,9 @@ namespace coder {
201202
AHardwareBuffer_describe_compat(hardwareBuffer, &bufferDesc);
202203

203204
int pixelSize = (*useFloats) ? sizeof(uint16_t) : sizeof(uint8_t);
204-
CopyUnalignedRGBA(imageData.data(), *stride, buffer,
205+
CopyUnaligned(imageData.data(), *stride, buffer,
205206
(int) bufferDesc.stride * 4 * pixelSize,
206-
(int) bufferDesc.width,
207+
(int) bufferDesc.width * 4,
207208
(int) bufferDesc.height,
208209
pixelSize);
209210

‎avif-coder/src/main/cpp/SizeScaler.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -152,10 +152,10 @@ bool RescaleImage(std::vector<uint8_t> &initialData,
152152

153153
} else {
154154
initialData.resize(*stride * imageHeight);
155-
coder::CopyUnalignedRGBA(reinterpret_cast<const uint8_t *>(data), *stride,
156-
reinterpret_cast<uint8_t *>(initialData.data()), *stride,
157-
imageWidth,
158-
imageHeight, useFloats ? 2 : 1);
155+
coder::CopyUnaligned(reinterpret_cast<const uint8_t *>(data), *stride,
156+
reinterpret_cast<uint8_t *>(initialData.data()), *stride,
157+
imageWidth * 4,
158+
imageHeight, useFloats ? 2 : 1);
159159
}
160160

161161
*imageWidthPtr = imageWidth;
@@ -172,10 +172,10 @@ bool RescaleImage(std::vector<uint8_t> &initialData,
172172
imageHeight = heif_image_get_height(img.get(), heif_channel_interleaved);
173173
initialData.resize(*stride * imageHeight);
174174

175-
coder::CopyUnalignedRGBA(reinterpret_cast<const uint8_t *>(data), *stride,
176-
reinterpret_cast<uint8_t *>(initialData.data()), *stride,
177-
imageWidth,
178-
imageHeight, useFloats ? 2 : 1);
175+
coder::CopyUnaligned(reinterpret_cast<const uint8_t *>(data), *stride,
176+
reinterpret_cast<uint8_t *>(initialData.data()), *stride,
177+
imageWidth * 4,
178+
imageHeight, useFloats ? 2 : 1);
179179

180180
*imageWidthPtr = imageWidth;
181181
*imageHeightPtr = imageHeight;

‎avif-coder/src/main/cpp/imagebits/CopyUnalignedRGBA.cpp‎

Lines changed: 19 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -46,44 +46,38 @@ namespace coder::HWY_NAMESPACE {
4646
using hwy::HWY_NAMESPACE::ScalableTag;
4747
using hwy::HWY_NAMESPACE::StoreU;
4848
using hwy::HWY_NAMESPACE::LoadU;
49+
using hwy::HWY_NAMESPACE::FixedTag;
4950
using hwy::HWY_NAMESPACE::Vec;
5051
using hwy::HWY_NAMESPACE::LoadInterleaved4;
5152
using hwy::HWY_NAMESPACE::StoreInterleaved4;
5253

5354
template<class D, typename Buf, typename T = Vec<D>>
5455
void
55-
CopyUnalignedRGBARow(const D d, const Buf *HWY_RESTRICT src, Buf *HWY_RESTRICT dst, int width) {
56+
Copy1Row(const D d, const Buf *HWY_RESTRICT src, Buf *HWY_RESTRICT dst, int width) {
5657
int x = 0;
5758
using VU = Vec<decltype(d)>;
5859
int pixels = d.MaxLanes();
5960
for (; x + pixels < width; x += pixels) {
60-
VU a, r, g, b;
61-
LoadInterleaved4(d, src, a, r, g, b);
62-
StoreInterleaved4(a, r, g, b, d, dst);
61+
VU a = LoadU(d, src);
62+
StoreU(a, d, reinterpret_cast<Buf *>(dst));
6363

64-
src += pixels * 4;
65-
dst += pixels * 4;
64+
src += pixels;
65+
dst += pixels;
6666
}
6767

6868
for (; x < width; ++x) {
6969
auto p1 = src[0];
70-
auto p2 = src[1];
71-
auto p3 = src[2];
72-
auto p4 = src[3];
73-
7470
dst[0] = p1;
75-
dst[1] = p2;
76-
dst[2] = p3;
77-
dst[3] = p4;
7871

79-
src += 4;
80-
dst += 4;
72+
src += 1;
73+
dst += 1;
8174
}
8275
}
8376

8477
void
8578
CopyUnalignedRGBA(const uint8_t *HWY_RESTRICT src, int srcStride, uint8_t *HWY_RESTRICT dst,
86-
int dstStride, int width,
79+
int dstStride,
80+
int width,
8781
int height,
8882
int pixelSize) {
8983
int threadCount = clamp(min(static_cast<int>(std::thread::hardware_concurrency()),
@@ -102,7 +96,7 @@ namespace coder::HWY_NAMESPACE {
10296
for (int y = start; y < end; ++y) {
10397
if (pixelSize == 1) {
10498
const ScalableTag<uint8_t> du8;
105-
auto fn = CopyUnalignedRGBARow<decltype(du8), uint8_t>;
99+
auto fn = Copy1Row<decltype(du8), uint8_t>;
106100
fn(du8,
107101
reinterpret_cast<const uint8_t *>(
108102
reinterpret_cast<const uint8_t *>(src) + (y * srcStride)),
@@ -111,7 +105,7 @@ namespace coder::HWY_NAMESPACE {
111105
width);
112106
} else if (pixelSize == 2) {
113107
const ScalableTag<uint16_t> du16;
114-
auto fn = CopyUnalignedRGBARow<decltype(du16), uint16_t>;
108+
auto fn = Copy1Row<decltype(du16), uint16_t>;
115109
fn(du16,
116110
reinterpret_cast<const uint16_t *>(
117111
reinterpret_cast<const uint8_t *>(src) +
@@ -121,14 +115,12 @@ namespace coder::HWY_NAMESPACE {
121115
width);
122116
} else if (pixelSize == 4) {
123117
const ScalableTag<uint32_t> df32;
124-
auto fn = CopyUnalignedRGBARow<decltype(df32), uint32_t>;
118+
auto fn = Copy1Row<decltype(df32), uint32_t>;
125119
fn(df32,
126120
reinterpret_cast<const uint32_t *>(
127-
reinterpret_cast<const uint8_t *>(src) +
128-
(y * srcStride)),
121+
reinterpret_cast<const uint8_t *>(src) + (y * srcStride)),
129122
reinterpret_cast<uint32_t *>(reinterpret_cast<uint8_t *>(dst) +
130-
(y * dstStride)),
131-
width);
123+
(y * dstStride)), width);
132124
}
133125
}
134126
});
@@ -138,82 +130,22 @@ namespace coder::HWY_NAMESPACE {
138130
thread.join();
139131
}
140132
}
141-
142-
void CopyUnalignedRGB565Row(const uint16_t *HWY_RESTRICT src, uint16_t *HWY_RESTRICT dst,
143-
int width) {
144-
int x = 0;
145-
const ScalableTag<uint16_t> du;
146-
using VU = Vec<decltype(du)>;
147-
int pixels = du.MaxLanes();
148-
for (; x + pixels < width; x += pixels) {
149-
VU pixel = LoadU(du, src);
150-
StoreU(pixel, du, dst);
151-
152-
src += pixels;
153-
dst += pixels;
154-
}
155-
156-
for (; x < width; ++x) {
157-
auto p1 = src[0];
158-
dst[0] = p1;
159-
src += 1;
160-
dst += 1;
161-
}
162-
}
163-
164-
void
165-
CopyUnalignedRGB565(const uint8_t *HWY_RESTRICT src, int srcStride, uint8_t *HWY_RESTRICT dst,
166-
int dstStride, int width,
167-
int height) {
168-
int threadCount = clamp(min(static_cast<int>(std::thread::hardware_concurrency()),
169-
height * width / (356 * 356)), 1, 12);
170-
vector<thread> workers;
171-
int segmentHeight = height / threadCount;
172-
173-
for (int i = 0; i < threadCount; i++) {
174-
int start = i * segmentHeight;
175-
int end = (i + 1) * segmentHeight;
176-
if (i == threadCount - 1) {
177-
end = height;
178-
}
179-
workers.emplace_back([start, end, src, dstStride, dst, srcStride, width]() {
180-
for (int y = start; y < end; ++y) {
181-
CopyUnalignedRGB565Row(
182-
reinterpret_cast<const uint16_t *>(src + (y * srcStride)),
183-
reinterpret_cast<uint16_t *>(dst + (y * dstStride)),
184-
width);
185-
}
186-
});
187-
}
188-
189-
for (std::thread &thread: workers) {
190-
thread.join();
191-
}
192-
}
193-
194133
}
195134

196135
HWY_AFTER_NAMESPACE();
197136

198137
#if HWY_ONCE
199138
namespace coder {
200139
HWY_EXPORT(CopyUnalignedRGBA);
201-
HWY_EXPORT(CopyUnalignedRGB565);
202140

203141
HWY_DLLEXPORT void
204-
CopyUnalignedRGBA(const uint8_t *HWY_RESTRICT src, int srcStride, uint8_t *HWY_RESTRICT dst,
205-
int dstStride, int width,
206-
int height,
207-
int pixelSize) {
142+
CopyUnaligned(const uint8_t *HWY_RESTRICT src, int srcStride, uint8_t *HWY_RESTRICT dst,
143+
int dstStride, int width,
144+
int height,
145+
int pixelSize) {
208146
HWY_DYNAMIC_DISPATCH(CopyUnalignedRGBA)(src, srcStride, dst, dstStride, width, height,
209147
pixelSize);
210148
}
211149

212-
HWY_DLLEXPORT void
213-
CopyUnalignedRGB565(const uint8_t *HWY_RESTRICT src, int srcStride, uint8_t *HWY_RESTRICT dst,
214-
int dstStride, int width,
215-
int height) {
216-
HWY_DYNAMIC_DISPATCH(CopyUnalignedRGB565)(src, srcStride, dst, dstStride, width, height);
217-
}
218150
}
219151
#endif

‎avif-coder/src/main/cpp/imagebits/CopyUnalignedRGBA.h‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,11 @@
3333

3434
namespace coder {
3535
void
36-
CopyUnalignedRGBA(const uint8_t *__restrict__ src, int srcStride, uint8_t *__restrict__ dst,
37-
int dstStride, int width,
38-
int height,
39-
int pixelSize);
40-
41-
void
42-
CopyUnalignedRGB565(const uint8_t *__restrict__ src, int srcStride, uint8_t *__restrict__ dst,
43-
int dstStride, int width,
44-
int height);
36+
CopyUnaligned(const uint8_t *__restrict__ src, int srcStride, uint8_t *__restrict__ dst,
37+
const int dstStride,
38+
const int width,
39+
const int height,
40+
const int pixelSize);
4541
}
4642

4743
#endif //AVIF_COPYUNALIGNEDRGBA_H

‎avif-coder/src/main/cpp/imagebits/Rgb1010102.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -307,31 +307,31 @@ namespace coder::HWY_NAMESPACE {
307307
PromoteUpperTo(di32, PromoteUpperTo(du16x4, upixels3)),
308308
PromoteUpperTo(di32, PromoteUpperTo(du16x4, upixels4)),
309309
permuteMap);
310-
Store(final, du, dst32 + 12);
310+
StoreU(final, du, dst32 + 12);
311311

312312
final = ConvertPixelsTo(du, di32,
313313
PromoteLowerTo(di32, PromoteUpperTo(du16x4, upixels1)),
314314
PromoteLowerTo(di32, PromoteUpperTo(du16x4, upixels2)),
315315
PromoteLowerTo(di32, PromoteUpperTo(du16x4, upixels3)),
316316
PromoteLowerTo(di32, PromoteUpperTo(du16x4, upixels4)),
317317
permuteMap);
318-
Store(final, du, dst32 + 8);
318+
StoreU(final, du, dst32 + 8);
319319

320320
final = ConvertPixelsTo(du, di32,
321321
PromoteUpperTo(di32, PromoteLowerTo(du16x4, upixels1)),
322322
PromoteUpperTo(di32, PromoteLowerTo(du16x4, upixels2)),
323323
PromoteUpperTo(di32, PromoteLowerTo(du16x4, upixels3)),
324324
PromoteUpperTo(di32, PromoteLowerTo(du16x4, upixels4)),
325325
permuteMap);
326-
Store(final, du, dst32 + 4);
326+
StoreU(final, du, dst32 + 4);
327327

328328
final = ConvertPixelsTo(du, di32,
329329
PromoteLowerTo(di32, PromoteLowerTo(du16x4, upixels1)),
330330
PromoteLowerTo(di32, PromoteLowerTo(du16x4, upixels2)),
331331
PromoteLowerTo(di32, PromoteLowerTo(du16x4, upixels3)),
332332
PromoteLowerTo(di32, PromoteLowerTo(du16x4, upixels4)),
333333
permuteMap);
334-
Store(final, du, dst32);
334+
StoreU(final, du, dst32);
335335

336336
data += pixels * 4;
337337
dst32 += pixels;

0 commit comments

Comments
 (0)