Skip to content

Commit 1ae6ab3

Browse files
updatebot-ciupdatebot-ci
committed
Bug 1781120 - Update dav1d to a029d6892c5c39f4cda629d4a3b676ef2e8288f6 r=chunmin
Differential Revision: https://phabricator.services.mozilla.com/D152673
1 parent afcea90 commit 1ae6ab3

File tree

5 files changed

+70
-46
lines changed

5 files changed

+70
-46
lines changed

‎media/libdav1d/moz.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ origin:
2020

2121
# Human-readable identifier for this version/release
2222
# Generally "version NNN", "tag SSS", "bookmark SSS"
23-
release: 6dc03eee53df62c1fb82a735f70a1b2b16d26bf0 (2022-07-13T21:33:38.000+00:00).
23+
release: a029d6892c5c39f4cda629d4a3b676ef2e8288f6 (2022-07-25T10:20:59.000+00:00).
2424

2525
# Revision to pull in
2626
# Must be a long or short commit SHA (long preferred)
27-
revision: 6dc03eee53df62c1fb82a735f70a1b2b16d26bf0
27+
revision: a029d6892c5c39f4cda629d4a3b676ef2e8288f6
2828

2929
# The package's license, where possible using the mnemonic from
3030
# https://spdx.org/licenses/

‎media/libdav1d/vcs_version.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
/* auto-generated, do not edit */
2-
#define DAV1D_VERSION "6dc03eee53df62c1fb82a735f70a1b2b16d26bf0"
2+
#define DAV1D_VERSION "a029d6892c5c39f4cda629d4a3b676ef2e8288f6"

‎third_party/dav1d/src/decode.c

+36-20
Original file line numberDiff line numberDiff line change
@@ -749,9 +749,9 @@ static inline void splat_intraref(const Dav1dContext *const c,
749749
c->refmvs_dsp.splat_mv(&t->rt.r[(t->by & 31) + 5], &tmpl, t->bx, bw4, bh4);
750750
}
751751

752-
static inline void mc_lowest_px(int *const dst, const int by4, const int bh4,
753-
const int mvy, const int ss_ver,
754-
const struct ScalableMotionParams *const smp)
752+
static void mc_lowest_px(int *const dst, const int by4, const int bh4,
753+
const int mvy, const int ss_ver,
754+
const struct ScalableMotionParams *const smp)
755755
{
756756
const int v_mul = 4 >> ss_ver;
757757
if (!smp->scale) {
@@ -766,14 +766,11 @@ static inline void mc_lowest_px(int *const dst, const int by4, const int bh4,
766766
}
767767
}
768768

769-
static inline void affine_lowest_px(Dav1dTaskContext *const t,
770-
int *const dst, const int is_chroma,
771-
const uint8_t *const b_dim,
772-
const Dav1dWarpedMotionParams *const wmp)
769+
static ALWAYS_INLINE void affine_lowest_px(Dav1dTaskContext *const t, int *const dst,
770+
const uint8_t *const b_dim,
771+
const Dav1dWarpedMotionParams *const wmp,
772+
const int ss_ver, const int ss_hor)
773773
{
774-
const Dav1dFrameContext *const f = t->f;
775-
const int ss_ver = is_chroma && f->cur.p.layout == DAV1D_PIXEL_LAYOUT_I420;
776-
const int ss_hor = is_chroma && f->cur.p.layout != DAV1D_PIXEL_LAYOUT_I444;
777774
const int h_mul = 4 >> ss_hor, v_mul = 4 >> ss_ver;
778775
assert(!((b_dim[0] * h_mul) & 7) && !((b_dim[1] * v_mul) & 7));
779776
const int32_t *const mat = wmp->matrix;
@@ -792,6 +789,25 @@ static inline void affine_lowest_px(Dav1dTaskContext *const t,
792789
}
793790
}
794791

792+
static NOINLINE void affine_lowest_px_luma(Dav1dTaskContext *const t, int *const dst,
793+
const uint8_t *const b_dim,
794+
const Dav1dWarpedMotionParams *const wmp)
795+
{
796+
affine_lowest_px(t, dst, b_dim, wmp, 0, 0);
797+
}
798+
799+
static NOINLINE void affine_lowest_px_chroma(Dav1dTaskContext *const t, int *const dst,
800+
const uint8_t *const b_dim,
801+
const Dav1dWarpedMotionParams *const wmp)
802+
{
803+
const Dav1dFrameContext *const f = t->f;
804+
assert(f->cur.p.layout != DAV1D_PIXEL_LAYOUT_I400);
805+
if (f->cur.p.layout == DAV1D_PIXEL_LAYOUT_I444)
806+
affine_lowest_px_luma(t, dst, b_dim, wmp);
807+
else
808+
affine_lowest_px(t, dst, b_dim, wmp, f->cur.p.layout & DAV1D_PIXEL_LAYOUT_I420, 1);
809+
}
810+
795811
static void obmc_lowest_px(Dav1dTaskContext *const t,
796812
int (*const dst)[2], const int is_chroma,
797813
const uint8_t *const b_dim,
@@ -2150,9 +2166,9 @@ static int decode_b(Dav1dTaskContext *const t,
21502166
((b->inter_mode == GLOBALMV && f->gmv_warp_allowed[b->ref[0]]) ||
21512167
(b->motion_mode == MM_WARP && t->warpmv.type > DAV1D_WM_TYPE_TRANSLATION)))
21522168
{
2153-
affine_lowest_px(t, &lowest_px[b->ref[0]][0], 0, b_dim,
2154-
b->motion_mode == MM_WARP ? &t->warpmv :
2155-
&f->frame_hdr->gmv[b->ref[0]]);
2169+
affine_lowest_px_luma(t, &lowest_px[b->ref[0]][0], b_dim,
2170+
b->motion_mode == MM_WARP ? &t->warpmv :
2171+
&f->frame_hdr->gmv[b->ref[0]]);
21562172
} else {
21572173
mc_lowest_px(&lowest_px[b->ref[0]][0], t->by, bh4, b->mv[0].y,
21582174
0, &f->svc[b->ref[0]][1]);
@@ -2203,9 +2219,9 @@ static int decode_b(Dav1dTaskContext *const t,
22032219
((b->inter_mode == GLOBALMV && f->gmv_warp_allowed[b->ref[0]]) ||
22042220
(b->motion_mode == MM_WARP && t->warpmv.type > DAV1D_WM_TYPE_TRANSLATION)))
22052221
{
2206-
affine_lowest_px(t, &lowest_px[b->ref[0]][1], 1, b_dim,
2207-
b->motion_mode == MM_WARP ? &t->warpmv :
2208-
&f->frame_hdr->gmv[b->ref[0]]);
2222+
affine_lowest_px_chroma(t, &lowest_px[b->ref[0]][1], b_dim,
2223+
b->motion_mode == MM_WARP ? &t->warpmv :
2224+
&f->frame_hdr->gmv[b->ref[0]]);
22092225
} else {
22102226
mc_lowest_px(&lowest_px[b->ref[0]][1],
22112227
t->by & ~ss_ver, bh4 << (bh4 == ss_ver),
@@ -2220,8 +2236,8 @@ static int decode_b(Dav1dTaskContext *const t,
22202236
// y
22212237
for (int i = 0; i < 2; i++) {
22222238
if (b->inter_mode == GLOBALMV_GLOBALMV && f->gmv_warp_allowed[b->ref[i]]) {
2223-
affine_lowest_px(t, &lowest_px[b->ref[i]][0], 0, b_dim,
2224-
&f->frame_hdr->gmv[b->ref[i]]);
2239+
affine_lowest_px_luma(t, &lowest_px[b->ref[i]][0], b_dim,
2240+
&f->frame_hdr->gmv[b->ref[i]]);
22252241
} else {
22262242
mc_lowest_px(&lowest_px[b->ref[i]][0], t->by, bh4,
22272243
b->mv[i].y, 0, &f->svc[b->ref[i]][1]);
@@ -2233,8 +2249,8 @@ static int decode_b(Dav1dTaskContext *const t,
22332249
if (b->inter_mode == GLOBALMV_GLOBALMV &&
22342250
imin(cbw4, cbh4) > 1 && f->gmv_warp_allowed[b->ref[i]])
22352251
{
2236-
affine_lowest_px(t, &lowest_px[b->ref[i]][1], 1, b_dim,
2237-
&f->frame_hdr->gmv[b->ref[i]]);
2252+
affine_lowest_px_chroma(t, &lowest_px[b->ref[i]][1], b_dim,
2253+
&f->frame_hdr->gmv[b->ref[i]]);
22382254
} else {
22392255
mc_lowest_px(&lowest_px[b->ref[i]][1], t->by, bh4,
22402256
b->mv[i].y, ss_ver, &f->svc[b->ref[i]][1]);

‎third_party/dav1d/src/lf_mask.c

+31-22
Original file line numberDiff line numberDiff line change
@@ -212,13 +212,13 @@ static inline void mask_edges_intra(uint16_t (*const masks)[32][3][2],
212212
#undef set_ctx
213213
}
214214

215-
static inline void mask_edges_chroma(uint16_t (*const masks)[32][2][2],
216-
const int cby4, const int cbx4,
217-
const int cw4, const int ch4,
218-
const int skip_inter,
219-
const enum RectTxfmSize tx,
220-
uint8_t *const a, uint8_t *const l,
221-
const int ss_hor, const int ss_ver)
215+
static void mask_edges_chroma(uint16_t (*const masks)[32][2][2],
216+
const int cby4, const int cbx4,
217+
const int cw4, const int ch4,
218+
const int skip_inter,
219+
const enum RectTxfmSize tx,
220+
uint8_t *const a, uint8_t *const l,
221+
const int ss_hor, const int ss_ver)
222222
{
223223
const TxfmInfo *const t_dim = &dav1d_txfm_dimensions[tx];
224224
const int twl4 = t_dim->lw, thl4 = t_dim->lh;
@@ -424,16 +424,14 @@ void dav1d_calc_eih(Av1FilterLUT *const lim_lut, const int filter_sharpness) {
424424
lim_lut->sharp[1] = sharp ? 9 - sharp : 0xff;
425425
}
426426

427-
static inline void calc_lf_value(uint8_t (*const lflvl_values)[2],
428-
const int is_chroma, const int base_lvl,
429-
const int lf_delta, const int seg_delta,
430-
const Dav1dLoopfilterModeRefDeltas *const mr_delta)
427+
static void calc_lf_value(uint8_t (*const lflvl_values)[2],
428+
const int base_lvl, const int lf_delta,
429+
const int seg_delta,
430+
const Dav1dLoopfilterModeRefDeltas *const mr_delta)
431431
{
432432
const int base = iclip(iclip(base_lvl + lf_delta, 0, 63) + seg_delta, 0, 63);
433433

434-
if (!base_lvl && is_chroma) {
435-
memset(lflvl_values, 0, 8 * 2);
436-
} else if (!mr_delta) {
434+
if (!mr_delta) {
437435
memset(lflvl_values, base, 8 * 2);
438436
} else {
439437
const int sh = base >= 32;
@@ -449,6 +447,17 @@ static inline void calc_lf_value(uint8_t (*const lflvl_values)[2],
449447
}
450448
}
451449

450+
static inline void calc_lf_value_chroma(uint8_t (*const lflvl_values)[2],
451+
const int base_lvl, const int lf_delta,
452+
const int seg_delta,
453+
const Dav1dLoopfilterModeRefDeltas *const mr_delta)
454+
{
455+
if (!base_lvl)
456+
memset(lflvl_values, 0, 8 * 2);
457+
else
458+
calc_lf_value(lflvl_values, base_lvl, lf_delta, seg_delta, mr_delta);
459+
}
460+
452461
void dav1d_calc_lf_values(uint8_t (*const lflvl_values)[4][8][2],
453462
const Dav1dFrameHeader *const hdr,
454463
const int8_t lf_delta[4])
@@ -467,16 +476,16 @@ void dav1d_calc_lf_values(uint8_t (*const lflvl_values)[4][8][2],
467476
const Dav1dSegmentationData *const segd =
468477
hdr->segmentation.enabled ? &hdr->segmentation.seg_data.d[s] : NULL;
469478

470-
calc_lf_value(lflvl_values[s][0], 0, hdr->loopfilter.level_y[0],
479+
calc_lf_value(lflvl_values[s][0], hdr->loopfilter.level_y[0],
471480
lf_delta[0], segd ? segd->delta_lf_y_v : 0, mr_deltas);
472-
calc_lf_value(lflvl_values[s][1], 0, hdr->loopfilter.level_y[1],
481+
calc_lf_value(lflvl_values[s][1], hdr->loopfilter.level_y[1],
473482
lf_delta[hdr->delta.lf.multi ? 1 : 0],
474483
segd ? segd->delta_lf_y_h : 0, mr_deltas);
475-
calc_lf_value(lflvl_values[s][2], 1, hdr->loopfilter.level_u,
476-
lf_delta[hdr->delta.lf.multi ? 2 : 0],
477-
segd ? segd->delta_lf_u : 0, mr_deltas);
478-
calc_lf_value(lflvl_values[s][3], 1, hdr->loopfilter.level_v,
479-
lf_delta[hdr->delta.lf.multi ? 3 : 0],
480-
segd ? segd->delta_lf_v : 0, mr_deltas);
484+
calc_lf_value_chroma(lflvl_values[s][2], hdr->loopfilter.level_u,
485+
lf_delta[hdr->delta.lf.multi ? 2 : 0],
486+
segd ? segd->delta_lf_u : 0, mr_deltas);
487+
calc_lf_value_chroma(lflvl_values[s][3], hdr->loopfilter.level_v,
488+
lf_delta[hdr->delta.lf.multi ? 3 : 0],
489+
segd ? segd->delta_lf_v : 0, mr_deltas);
481490
}
482491
}

‎third_party/dav1d/src/x86/loopfilter16_avx2.asm

-1
Original file line numberDiff line numberDiff line change
@@ -761,7 +761,6 @@ SECTION .text
761761
psubw m8, m15
762762
paddw m8, m0
763763
psrlw m10, m8, 4
764-
pand m10, m1
765764
%ifidn %2, v
766765
mova m9, [tmpq+strideq*1]
767766
%else

0 commit comments

Comments
 (0)