dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2024-12-28 14:38:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge "smartYUV: simplify main loop"

Browse Source
This commit is contained in:
Pascal Massimino 2016-09-12 17:14:22 +00:00 committed by Gerrit Code Review
commit c27d821096
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/enc/picture_csp.c
View File

@ -281,7 +281,7 @@ static void UpdateChroma(const fixed_y_t* src1, const fixed_y_t* src2,
static void StoreGray(const fixed_y_t* rgb, fixed_y_t* y, int len) { static void StoreGray(const fixed_y_t* rgb, fixed_y_t* y, int len) {
int i; int i;
for (i = 0; i < len; ++i) { for (i = 0; i < len; ++i) {
y[i] = clip_y(RGBToGray(rgb[0], rgb[1], rgb[2])); y[i] = RGBToGray(rgb[0], rgb[1], rgb[2]);
rgb += 3; rgb += 3;
} }
} }
@ -470,21 +470,22 @@ static int PreprocessARGB(const uint8_t* const r_ptr,
} else { } else {
memcpy(src2, src1, 3 * w * sizeof(*src2)); memcpy(src2, src1, 3 * w * sizeof(*src2));
} }
StoreGray(src1, dst_y, 2 * w); // convert two lines at a time
UpdateW(src1, target_y + (j + 0) * w, w); UpdateW(src1, target_y + (j + 0) * w, w);
UpdateW(src2, target_y + (j + 1) * w, w); UpdateW(src2, target_y + (j + 1) * w, w);
UpdateChroma(src1, src2, target_uv + uv_off, uv_w); UpdateChroma(src1, src2, target_uv + uv_off, uv_w);
memcpy(best_uv + uv_off, target_uv + uv_off, 3 * uv_w * sizeof(*best_uv)); memcpy(best_uv + uv_off, target_uv + uv_off, 3 * uv_w * sizeof(*best_uv));
// convert two lines at a time
StoreGray(src1, dst_y, 2 * w);
} }
// Iterate and resolve clipping conflicts. // Iterate and resolve clipping conflicts.
for (iter = 0; iter < kNumIterations; ++iter) { for (iter = 0; iter < kNumIterations; ++iter) {
int k;
const fixed_t* cur_uv = best_uv; const fixed_t* cur_uv = best_uv;
const fixed_t* prev_uv = best_uv; const fixed_t* prev_uv = best_uv;
uint64_t diff_y_sum = 0; uint64_t diff_y_sum = 0;
for (j = 0; j < h; j += 2) { for (j = 0; j < h; j += 2) {
const int uv_off = (j >> 1) * 3 * uv_w;
fixed_y_t* const src1 = tmp_buffer; fixed_y_t* const src1 = tmp_buffer;
fixed_y_t* const src2 = tmp_buffer + 3 * w; fixed_y_t* const src2 = tmp_buffer + 3 * w;
{ {
@ -507,17 +508,9 @@ static int PreprocessARGB(const uint8_t* const r_ptr,
best_y[off] = clip_y(new_y); best_y[off] = clip_y(new_y);
diff_y_sum += (uint64_t)abs(diff_y); diff_y_sum += (uint64_t)abs(diff_y);
} }
for (i = 0; i < uv_w; ++i) { for (i = 0; i < 3 * uv_w; ++i) {
const int off = 3 * (i + (j >> 1) * uv_w); const int diff_uv = (int)target_uv[uv_off + i] - best_rgb_uv[i];
int W; best_uv[uv_off + i] += diff_uv;
for (k = 0; k <= 2; ++k) {
const int diff_uv = (int)target_uv[off + k] - best_rgb_uv[3 * i + k];
best_uv[off + k] += diff_uv;
}
W = RGBToGray(best_uv[off + 0], best_uv[off + 1], best_uv[off + 2]);
for (k = 0; k <= 2; ++k) {
best_uv[off + k] -= W;
}
} }
} }
// test exit condition // test exit condition