mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-02-14 22:22:59 +02:00
Merge remote-tracking branch 'rbultje/vp9-profile1-wip'
* rbultje/vp9-profile1-wip: vp9: add fate test for 422. vp9: copy bug in libvpx for 4:2:2 chroma bs=8x4/4x4 prediction. vp9: add yuv440 fate test. vp9: fix mask_edges and filter_plane_rows/cols() for 440. vp9: more specifically specify mask destination to mask_edges(). vp9: add fate test for profile 1 444. vp9: don't create special u/v filter masks for 444. vp9: merge uv loopfilter code into generic filter_plane_rows/cols(). vp9: split out loopfilter luma rows/cols functions from loopfilter_sb(). vp9: invert order of two conditions. vp9: use correct chroma subsampling for profile 1 inter block recon. vp9: use correct chroma subsampling for profile 1 intra block recon. vp9: take chroma subsampling into account when walking the block tree. vp9: support non-420 chroma subsampling for profile 1 token decoding. vp9: increase buffer sizes for non-420 chroma subsamplings. vp9: profile 1 header decoding. Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
d56245f770
816
libavcodec/vp9.c
816
libavcodec/vp9.c
File diff suppressed because it is too large
Load Diff
@ -21,6 +21,12 @@
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
#define ROUNDED_DIV_MVx2(a, b) \
|
||||
(VP56mv) { .x = ROUNDED_DIV(a.x + b.x, 2), .y = ROUNDED_DIV(a.y + b.y, 2) }
|
||||
#define ROUNDED_DIV_MVx4(a, b, c, d) \
|
||||
(VP56mv) { .x = ROUNDED_DIV(a.x + b.x + c.x + d.x, 4), \
|
||||
.y = ROUNDED_DIV(a.y + b.y + c.y + d.y, 4) }
|
||||
|
||||
static void FN(inter_pred)(AVCodecContext *ctx)
|
||||
{
|
||||
static const uint8_t bwlog_tab[2][N_BS_SIZES] = {
|
||||
@ -44,6 +50,8 @@ static void FN(inter_pred)(AVCodecContext *ctx)
|
||||
|
||||
// y inter pred
|
||||
if (b->bs > BS_8x8) {
|
||||
VP56mv uvmv;
|
||||
|
||||
if (b->bs == BS_8x4) {
|
||||
mc_luma_dir(s, mc[3][b->filter][0], s->dst[0], ls_y,
|
||||
ref1->data[0], ref1->linesize[0], tref1,
|
||||
@ -52,6 +60,38 @@ static void FN(inter_pred)(AVCodecContext *ctx)
|
||||
s->dst[0] + 4 * ls_y, ls_y,
|
||||
ref1->data[0], ref1->linesize[0], tref1,
|
||||
(row << 3) + 4, col << 3, &b->mv[2][0], 8, 4, w1, h1, 0);
|
||||
w1 = (w1 + s->ss_h) >> s->ss_h;
|
||||
if (s->ss_v) {
|
||||
h1 = (h1 + 1) >> 1;
|
||||
uvmv = ROUNDED_DIV_MVx2(b->mv[0][0], b->mv[2][0]);
|
||||
mc_chroma_dir(s, mc[3 + s->ss_h][b->filter][0],
|
||||
s->dst[1], s->dst[2], ls_uv,
|
||||
ref1->data[1], ref1->linesize[1],
|
||||
ref1->data[2], ref1->linesize[2], tref1,
|
||||
row << 2, col << (3 - s->ss_h),
|
||||
&uvmv, 8 >> s->ss_h, 4, w1, h1, 0);
|
||||
} else {
|
||||
mc_chroma_dir(s, mc[3 + s->ss_h][b->filter][0],
|
||||
s->dst[1], s->dst[2], ls_uv,
|
||||
ref1->data[1], ref1->linesize[1],
|
||||
ref1->data[2], ref1->linesize[2], tref1,
|
||||
row << 3, col << (3 - s->ss_h),
|
||||
&b->mv[0][0], 8 >> s->ss_h, 4, w1, h1, 0);
|
||||
// BUG for 4:2:2 bs=8x4, libvpx uses the wrong block index
|
||||
// to get the motion vector for the bottom 4x4 block
|
||||
// https://code.google.com/p/webm/issues/detail?id=993
|
||||
if (s->ss_h == 0) {
|
||||
uvmv = b->mv[2][0];
|
||||
} else {
|
||||
uvmv = ROUNDED_DIV_MVx2(b->mv[0][0], b->mv[2][0]);
|
||||
}
|
||||
mc_chroma_dir(s, mc[3 + s->ss_h][b->filter][0],
|
||||
s->dst[1] + 4 * ls_uv, s->dst[2] + 4 * ls_uv, ls_uv,
|
||||
ref1->data[1], ref1->linesize[1],
|
||||
ref1->data[2], ref1->linesize[2], tref1,
|
||||
(row << 3) + 4, col << (3 - s->ss_h),
|
||||
&uvmv, 8 >> s->ss_h, 4, w1, h1, 0);
|
||||
}
|
||||
|
||||
if (b->comp) {
|
||||
mc_luma_dir(s, mc[3][b->filter][1], s->dst[0], ls_y,
|
||||
@ -61,6 +101,38 @@ static void FN(inter_pred)(AVCodecContext *ctx)
|
||||
s->dst[0] + 4 * ls_y, ls_y,
|
||||
ref2->data[0], ref2->linesize[0], tref2,
|
||||
(row << 3) + 4, col << 3, &b->mv[2][1], 8, 4, w2, h2, 1);
|
||||
w2 = (w2 + s->ss_h) >> s->ss_h;
|
||||
if (s->ss_v) {
|
||||
h2 = (h2 + 1) >> 1;
|
||||
uvmv = ROUNDED_DIV_MVx2(b->mv[0][1], b->mv[2][1]);
|
||||
mc_chroma_dir(s, mc[3 + s->ss_h][b->filter][1],
|
||||
s->dst[1], s->dst[2], ls_uv,
|
||||
ref2->data[1], ref2->linesize[1],
|
||||
ref2->data[2], ref2->linesize[2], tref2,
|
||||
row << 2, col << (3 - s->ss_h),
|
||||
&uvmv, 8 >> s->ss_h, 4, w2, h2, 1);
|
||||
} else {
|
||||
mc_chroma_dir(s, mc[3 + s->ss_h][b->filter][1],
|
||||
s->dst[1], s->dst[2], ls_uv,
|
||||
ref2->data[1], ref2->linesize[1],
|
||||
ref2->data[2], ref2->linesize[2], tref2,
|
||||
row << 3, col << (3 - s->ss_h),
|
||||
&b->mv[0][1], 8 >> s->ss_h, 4, w2, h2, 1);
|
||||
// BUG for 4:2:2 bs=8x4, libvpx uses the wrong block index
|
||||
// to get the motion vector for the bottom 4x4 block
|
||||
// https://code.google.com/p/webm/issues/detail?id=993
|
||||
if (s->ss_h == 0) {
|
||||
uvmv = b->mv[2][1];
|
||||
} else {
|
||||
uvmv = ROUNDED_DIV_MVx2(b->mv[0][1], b->mv[2][1]);
|
||||
}
|
||||
mc_chroma_dir(s, mc[3 + s->ss_h][b->filter][1],
|
||||
s->dst[1] + 4 * ls_uv, s->dst[2] + 4 * ls_uv, ls_uv,
|
||||
ref2->data[1], ref2->linesize[1],
|
||||
ref2->data[2], ref2->linesize[2], tref2,
|
||||
(row << 3) + 4, col << (3 - s->ss_h),
|
||||
&uvmv, 8 >> s->ss_h, 4, w2, h2, 1);
|
||||
}
|
||||
}
|
||||
} else if (b->bs == BS_4x8) {
|
||||
mc_luma_dir(s, mc[4][b->filter][0], s->dst[0], ls_y,
|
||||
@ -69,6 +141,30 @@ static void FN(inter_pred)(AVCodecContext *ctx)
|
||||
mc_luma_dir(s, mc[4][b->filter][0], s->dst[0] + 4, ls_y,
|
||||
ref1->data[0], ref1->linesize[0], tref1,
|
||||
row << 3, (col << 3) + 4, &b->mv[1][0], 4, 8, w1, h1, 0);
|
||||
h1 = (h1 + s->ss_v) >> s->ss_v;
|
||||
if (s->ss_h) {
|
||||
w1 = (w1 + 1) >> 1;
|
||||
uvmv = ROUNDED_DIV_MVx2(b->mv[0][0], b->mv[1][0]);
|
||||
mc_chroma_dir(s, mc[4][b->filter][0],
|
||||
s->dst[1], s->dst[2], ls_uv,
|
||||
ref1->data[1], ref1->linesize[1],
|
||||
ref1->data[2], ref1->linesize[2], tref1,
|
||||
row << (3 - s->ss_v), col << 2,
|
||||
&uvmv, 4, 8 >> s->ss_v, w1, h1, 0);
|
||||
} else {
|
||||
mc_chroma_dir(s, mc[4][b->filter][0],
|
||||
s->dst[1], s->dst[2], ls_uv,
|
||||
ref1->data[1], ref1->linesize[1],
|
||||
ref1->data[2], ref1->linesize[2], tref1,
|
||||
row << (3 - s->ss_v), col << 3,
|
||||
&b->mv[0][0], 4, 8 >> s->ss_v, w1, h1, 0);
|
||||
mc_chroma_dir(s, mc[4][b->filter][0],
|
||||
s->dst[1] + 4, s->dst[2] + 4, ls_uv,
|
||||
ref1->data[1], ref1->linesize[1],
|
||||
ref1->data[2], ref1->linesize[2], tref1,
|
||||
row << (3 - s->ss_v), (col << 3) + 4,
|
||||
&b->mv[1][0], 4, 8 >> s->ss_v, w1, h1, 0);
|
||||
}
|
||||
|
||||
if (b->comp) {
|
||||
mc_luma_dir(s, mc[4][b->filter][1], s->dst[0], ls_y,
|
||||
@ -77,6 +173,30 @@ static void FN(inter_pred)(AVCodecContext *ctx)
|
||||
mc_luma_dir(s, mc[4][b->filter][1], s->dst[0] + 4, ls_y,
|
||||
ref2->data[0], ref2->linesize[0], tref2,
|
||||
row << 3, (col << 3) + 4, &b->mv[1][1], 4, 8, w2, h2, 1);
|
||||
h2 = (h2 + s->ss_v) >> s->ss_v;
|
||||
if (s->ss_h) {
|
||||
w2 = (w2 + 1) >> 1;
|
||||
uvmv = ROUNDED_DIV_MVx2(b->mv[0][1], b->mv[1][1]);
|
||||
mc_chroma_dir(s, mc[4][b->filter][1],
|
||||
s->dst[1], s->dst[2], ls_uv,
|
||||
ref2->data[1], ref2->linesize[1],
|
||||
ref2->data[2], ref2->linesize[2], tref2,
|
||||
row << (3 - s->ss_v), col << 2,
|
||||
&uvmv, 4, 8 >> s->ss_v, w2, h2, 1);
|
||||
} else {
|
||||
mc_chroma_dir(s, mc[4][b->filter][1],
|
||||
s->dst[1], s->dst[2], ls_uv,
|
||||
ref2->data[1], ref2->linesize[1],
|
||||
ref2->data[2], ref2->linesize[2], tref2,
|
||||
row << (3 - s->ss_v), col << 3,
|
||||
&b->mv[0][1], 4, 8 >> s->ss_v, w2, h2, 1);
|
||||
mc_chroma_dir(s, mc[4][b->filter][1],
|
||||
s->dst[1] + 4, s->dst[2] + 4, ls_uv,
|
||||
ref2->data[1], ref2->linesize[1],
|
||||
ref2->data[2], ref2->linesize[2], tref2,
|
||||
row << (3 - s->ss_v), (col << 3) + 4,
|
||||
&b->mv[1][1], 4, 8 >> s->ss_v, w2, h2, 1);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
av_assert2(b->bs == BS_4x4);
|
||||
@ -97,6 +217,81 @@ static void FN(inter_pred)(AVCodecContext *ctx)
|
||||
s->dst[0] + 4 * ls_y + 4, ls_y,
|
||||
ref1->data[0], ref1->linesize[0], tref1,
|
||||
(row << 3) + 4, (col << 3) + 4, &b->mv[3][0], 4, 4, w1, h1, 0);
|
||||
if (s->ss_v) {
|
||||
h1 = (h1 + 1) >> 1;
|
||||
if (s->ss_h) {
|
||||
w1 = (w1 + 1) >> 1;
|
||||
uvmv = ROUNDED_DIV_MVx4(b->mv[0][0], b->mv[1][0],
|
||||
b->mv[2][0], b->mv[3][0]);
|
||||
mc_chroma_dir(s, mc[4][b->filter][0],
|
||||
s->dst[1], s->dst[2], ls_uv,
|
||||
ref1->data[1], ref1->linesize[1],
|
||||
ref1->data[2], ref1->linesize[2], tref1,
|
||||
row << 2, col << 2,
|
||||
&uvmv, 4, 4, w1, h1, 0);
|
||||
} else {
|
||||
uvmv = ROUNDED_DIV_MVx2(b->mv[0][0], b->mv[2][0]);
|
||||
mc_chroma_dir(s, mc[4][b->filter][0],
|
||||
s->dst[1], s->dst[2], ls_uv,
|
||||
ref1->data[1], ref1->linesize[1],
|
||||
ref1->data[2], ref1->linesize[2], tref1,
|
||||
row << 2, col << 3,
|
||||
&uvmv, 4, 4, w1, h1, 0);
|
||||
uvmv = ROUNDED_DIV_MVx2(b->mv[1][0], b->mv[3][0]);
|
||||
mc_chroma_dir(s, mc[4][b->filter][0],
|
||||
s->dst[1] + 4, s->dst[2] + 4, ls_uv,
|
||||
ref1->data[1], ref1->linesize[1],
|
||||
ref1->data[2], ref1->linesize[2], tref1,
|
||||
row << 2, (col << 3) + 4,
|
||||
&uvmv, 4, 4, w1, h1, 0);
|
||||
}
|
||||
} else {
|
||||
if (s->ss_h) {
|
||||
w1 = (w1 + 1) >> 1;
|
||||
uvmv = ROUNDED_DIV_MVx2(b->mv[0][0], b->mv[1][0]);
|
||||
mc_chroma_dir(s, mc[4][b->filter][0],
|
||||
s->dst[1], s->dst[2], ls_uv,
|
||||
ref1->data[1], ref1->linesize[1],
|
||||
ref1->data[2], ref1->linesize[2], tref1,
|
||||
row << 3, col << 2,
|
||||
&uvmv, 4, 4, w1, h1, 0);
|
||||
// BUG libvpx uses wrong block index for 4:2:2 bs=4x4
|
||||
// bottom block
|
||||
// https://code.google.com/p/webm/issues/detail?id=993
|
||||
uvmv = ROUNDED_DIV_MVx2(b->mv[1][0], b->mv[2][0]);
|
||||
mc_chroma_dir(s, mc[4][b->filter][0],
|
||||
s->dst[1] + 4 * ls_uv, s->dst[2] + 4 * ls_uv, ls_uv,
|
||||
ref1->data[1], ref1->linesize[1],
|
||||
ref1->data[2], ref1->linesize[2], tref1,
|
||||
(row << 3) + 4, col << 2,
|
||||
&uvmv, 4, 4, w1, h1, 0);
|
||||
} else {
|
||||
mc_chroma_dir(s, mc[4][b->filter][0],
|
||||
s->dst[1], s->dst[2], ls_uv,
|
||||
ref1->data[1], ref1->linesize[1],
|
||||
ref1->data[2], ref1->linesize[2], tref1,
|
||||
row << 3, col << 3,
|
||||
&b->mv[0][0], 4, 4, w1, h1, 0);
|
||||
mc_chroma_dir(s, mc[4][b->filter][0],
|
||||
s->dst[1] + 4, s->dst[2] + 4, ls_uv,
|
||||
ref1->data[1], ref1->linesize[1],
|
||||
ref1->data[2], ref1->linesize[2], tref1,
|
||||
row << 3, (col << 3) + 4,
|
||||
&b->mv[1][0], 4, 4, w1, h1, 0);
|
||||
mc_chroma_dir(s, mc[4][b->filter][0],
|
||||
s->dst[1] + 4 * ls_uv, s->dst[2] + 4 * ls_uv, ls_uv,
|
||||
ref1->data[1], ref1->linesize[1],
|
||||
ref1->data[2], ref1->linesize[2], tref1,
|
||||
(row << 3) + 4, col << 3,
|
||||
&b->mv[2][0], 4, 4, w1, h1, 0);
|
||||
mc_chroma_dir(s, mc[4][b->filter][0],
|
||||
s->dst[1] + 4 * ls_uv + 4, s->dst[2] + 4 * ls_uv + 4, ls_uv,
|
||||
ref1->data[1], ref1->linesize[1],
|
||||
ref1->data[2], ref1->linesize[2], tref1,
|
||||
(row << 3) + 4, (col << 3) + 4,
|
||||
&b->mv[3][0], 4, 4, w1, h1, 0);
|
||||
}
|
||||
}
|
||||
|
||||
if (b->comp) {
|
||||
mc_luma_dir(s, mc[4][b->filter][1], s->dst[0], ls_y,
|
||||
@ -113,59 +308,112 @@ static void FN(inter_pred)(AVCodecContext *ctx)
|
||||
s->dst[0] + 4 * ls_y + 4, ls_y,
|
||||
ref2->data[0], ref2->linesize[0], tref2,
|
||||
(row << 3) + 4, (col << 3) + 4, &b->mv[3][1], 4, 4, w2, h2, 1);
|
||||
if (s->ss_v) {
|
||||
h2 = (h2 + 1) >> 1;
|
||||
if (s->ss_h) {
|
||||
w2 = (w2 + 1) >> 1;
|
||||
uvmv = ROUNDED_DIV_MVx4(b->mv[0][1], b->mv[1][1],
|
||||
b->mv[2][1], b->mv[3][1]);
|
||||
mc_chroma_dir(s, mc[4][b->filter][1],
|
||||
s->dst[1], s->dst[2], ls_uv,
|
||||
ref2->data[1], ref2->linesize[1],
|
||||
ref2->data[2], ref2->linesize[2], tref2,
|
||||
row << 2, col << 2,
|
||||
&uvmv, 4, 4, w2, h2, 1);
|
||||
} else {
|
||||
uvmv = ROUNDED_DIV_MVx2(b->mv[0][1], b->mv[2][1]);
|
||||
mc_chroma_dir(s, mc[4][b->filter][1],
|
||||
s->dst[1], s->dst[2], ls_uv,
|
||||
ref2->data[1], ref2->linesize[1],
|
||||
ref2->data[2], ref2->linesize[2], tref2,
|
||||
row << 2, col << 3,
|
||||
&uvmv, 4, 4, w2, h2, 1);
|
||||
uvmv = ROUNDED_DIV_MVx2(b->mv[1][1], b->mv[3][1]);
|
||||
mc_chroma_dir(s, mc[4][b->filter][1],
|
||||
s->dst[1] + 4, s->dst[2] + 4, ls_uv,
|
||||
ref2->data[1], ref2->linesize[1],
|
||||
ref2->data[2], ref2->linesize[2], tref2,
|
||||
row << 2, (col << 3) + 4,
|
||||
&uvmv, 4, 4, w2, h2, 1);
|
||||
}
|
||||
} else {
|
||||
if (s->ss_h) {
|
||||
w2 = (w2 + 1) >> 1;
|
||||
uvmv = ROUNDED_DIV_MVx2(b->mv[0][1], b->mv[1][1]);
|
||||
mc_chroma_dir(s, mc[4][b->filter][1],
|
||||
s->dst[1], s->dst[2], ls_uv,
|
||||
ref2->data[1], ref2->linesize[1],
|
||||
ref2->data[2], ref2->linesize[2], tref2,
|
||||
row << 3, col << 2,
|
||||
&uvmv, 4, 4, w2, h2, 1);
|
||||
// BUG libvpx uses wrong block index for 4:2:2 bs=4x4
|
||||
// bottom block
|
||||
// https://code.google.com/p/webm/issues/detail?id=993
|
||||
uvmv = ROUNDED_DIV_MVx2(b->mv[1][1], b->mv[2][1]);
|
||||
mc_chroma_dir(s, mc[4][b->filter][1],
|
||||
s->dst[1] + 4 * ls_uv, s->dst[2] + 4 * ls_uv, ls_uv,
|
||||
ref2->data[1], ref2->linesize[1],
|
||||
ref2->data[2], ref2->linesize[2], tref2,
|
||||
(row << 3) + 4, col << 2,
|
||||
&uvmv, 4, 4, w2, h2, 1);
|
||||
} else {
|
||||
mc_chroma_dir(s, mc[4][b->filter][1],
|
||||
s->dst[1], s->dst[2], ls_uv,
|
||||
ref2->data[1], ref2->linesize[1],
|
||||
ref2->data[2], ref2->linesize[2], tref2,
|
||||
row << 3, col << 3,
|
||||
&b->mv[0][1], 4, 4, w2, h2, 1);
|
||||
mc_chroma_dir(s, mc[4][b->filter][1],
|
||||
s->dst[1] + 4, s->dst[2] + 4, ls_uv,
|
||||
ref2->data[1], ref2->linesize[1],
|
||||
ref2->data[2], ref2->linesize[2], tref2,
|
||||
row << 3, (col << 3) + 4,
|
||||
&b->mv[1][1], 4, 4, w2, h2, 1);
|
||||
mc_chroma_dir(s, mc[4][b->filter][1],
|
||||
s->dst[1] + 4 * ls_uv, s->dst[2] + 4 * ls_uv, ls_uv,
|
||||
ref2->data[1], ref2->linesize[1],
|
||||
ref2->data[2], ref2->linesize[2], tref2,
|
||||
(row << 3) + 4, col << 3,
|
||||
&b->mv[2][1], 4, 4, w2, h2, 1);
|
||||
mc_chroma_dir(s, mc[4][b->filter][1],
|
||||
s->dst[1] + 4 * ls_uv + 4, s->dst[2] + 4 * ls_uv + 4, ls_uv,
|
||||
ref2->data[1], ref2->linesize[1],
|
||||
ref2->data[2], ref2->linesize[2], tref2,
|
||||
(row << 3) + 4, (col << 3) + 4,
|
||||
&b->mv[3][1], 4, 4, w2, h2, 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
int bwl = bwlog_tab[0][b->bs];
|
||||
int bw = bwh_tab[0][b->bs][0] * 4, bh = bwh_tab[0][b->bs][1] * 4;
|
||||
int uvbw = bwh_tab[s->ss_h][b->bs][0] * 4, uvbh = bwh_tab[s->ss_v][b->bs][1] * 4;
|
||||
|
||||
mc_luma_dir(s, mc[bwl][b->filter][0], s->dst[0], ls_y,
|
||||
ref1->data[0], ref1->linesize[0], tref1,
|
||||
row << 3, col << 3, &b->mv[0][0],bw, bh, w1, h1, 0);
|
||||
|
||||
if (b->comp)
|
||||
mc_luma_dir(s, mc[bwl][b->filter][1], s->dst[0], ls_y,
|
||||
ref2->data[0], ref2->linesize[0], tref2,
|
||||
row << 3, col << 3, &b->mv[0][1], bw, bh, w2, h2, 1);
|
||||
}
|
||||
|
||||
// uv inter pred
|
||||
{
|
||||
int bwl = bwlog_tab[1][b->bs];
|
||||
int bw = bwh_tab[1][b->bs][0] * 4, bh = bwh_tab[1][b->bs][1] * 4;
|
||||
VP56mv mvuv;
|
||||
|
||||
w1 = (w1 + 1) >> 1;
|
||||
h1 = (h1 + 1) >> 1;
|
||||
if (b->comp) {
|
||||
w2 = (w2 + 1) >> 1;
|
||||
h2 = (h2 + 1) >> 1;
|
||||
}
|
||||
if (b->bs > BS_8x8) {
|
||||
mvuv.x = ROUNDED_DIV(b->mv[0][0].x + b->mv[1][0].x + b->mv[2][0].x + b->mv[3][0].x, 4);
|
||||
mvuv.y = ROUNDED_DIV(b->mv[0][0].y + b->mv[1][0].y + b->mv[2][0].y + b->mv[3][0].y, 4);
|
||||
} else {
|
||||
mvuv = b->mv[0][0];
|
||||
}
|
||||
|
||||
mc_chroma_dir(s, mc[bwl][b->filter][0],
|
||||
row << 3, col << 3, &b->mv[0][0], bw, bh, w1, h1, 0);
|
||||
w1 = (w1 + s->ss_h) >> s->ss_h;
|
||||
h1 = (h1 + s->ss_v) >> s->ss_v;
|
||||
mc_chroma_dir(s, mc[bwl + s->ss_h][b->filter][0],
|
||||
s->dst[1], s->dst[2], ls_uv,
|
||||
ref1->data[1], ref1->linesize[1],
|
||||
ref1->data[2], ref1->linesize[2], tref1,
|
||||
row << 2, col << 2, &mvuv, bw, bh, w1, h1, 0);
|
||||
row << (3 - s->ss_v), col << (3 - s->ss_h),
|
||||
&b->mv[0][0], uvbw, uvbh, w1, h1, 0);
|
||||
|
||||
if (b->comp) {
|
||||
if (b->bs > BS_8x8) {
|
||||
mvuv.x = ROUNDED_DIV(b->mv[0][1].x + b->mv[1][1].x + b->mv[2][1].x + b->mv[3][1].x, 4);
|
||||
mvuv.y = ROUNDED_DIV(b->mv[0][1].y + b->mv[1][1].y + b->mv[2][1].y + b->mv[3][1].y, 4);
|
||||
} else {
|
||||
mvuv = b->mv[0][1];
|
||||
}
|
||||
mc_chroma_dir(s, mc[bwl][b->filter][1],
|
||||
mc_luma_dir(s, mc[bwl][b->filter][1], s->dst[0], ls_y,
|
||||
ref2->data[0], ref2->linesize[0], tref2,
|
||||
row << 3, col << 3, &b->mv[0][1], bw, bh, w2, h2, 1);
|
||||
w2 = (w2 + s->ss_h) >> s->ss_h;
|
||||
h2 = (h2 + s->ss_v) >> s->ss_v;
|
||||
mc_chroma_dir(s, mc[bwl + s->ss_h][b->filter][1],
|
||||
s->dst[1], s->dst[2], ls_uv,
|
||||
ref2->data[1], ref2->linesize[1],
|
||||
ref2->data[2], ref2->linesize[2], tref2,
|
||||
row << 2, col << 2, &mvuv, bw, bh, w2, h2, 1);
|
||||
row << (3 - s->ss_v), col << (3 - s->ss_h),
|
||||
&b->mv[0][1], uvbw, uvbh, w2, h2, 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -85,6 +85,12 @@ fate-vp9$(2)-$(1): CMD = framemd5 $(3) -i $(TARGET_SAMPLES)/vp9-test-vectors/vp9
|
||||
fate-vp9$(2)-$(1): REF = $(SRC_PATH)/tests/ref/fate/vp9-$(1)
|
||||
endef
|
||||
|
||||
define FATE_VP9_PROFILE_SUITE
|
||||
FATE_VP9-$(CONFIG_MATROSKA_DEMUXER) += fate-vp9p$(2)-$(1)
|
||||
fate-vp9p$(2)-$(1): CMD = framemd5 -i $(TARGET_SAMPLES)/vp9-test-vectors/vp9$(2)-2-$(1).webm
|
||||
fate-vp9p$(2)-$(1): REF = $(SRC_PATH)/tests/ref/fate/vp9p$(2)-$(1)
|
||||
endef
|
||||
|
||||
VP9_Q = 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 \
|
||||
16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 \
|
||||
32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 \
|
||||
@ -94,24 +100,27 @@ VP9_SIZE_A = 08 10 16 18 32 34 64 66
|
||||
VP9_SIZE_B = 196 198 200 202 208 210 224 226
|
||||
|
||||
define FATE_VP9_FULL
|
||||
$(foreach Q,$(VP9_Q),$(eval $(call FATE_VP9_SUITE,00-quantizer-$(Q),$(1),$(2))))
|
||||
$(foreach SHARP,$(VP9_SHARP),$(eval $(call FATE_VP9_SUITE,01-sharpness-$(SHARP),$(1),$(2))))
|
||||
$(foreach W,$(VP9_SIZE_A),$(eval $(foreach H,$(VP9_SIZE_A),$(eval $(call FATE_VP9_SUITE,02-size-$(W)x$(H),$(1),$(2))))))
|
||||
$(foreach W,$(VP9_SIZE_B),$(eval $(foreach H,$(VP9_SIZE_B),$(eval $(call FATE_VP9_SUITE,03-size-$(W)x$(H),$(1),$(2))))))
|
||||
$(eval $(call FATE_VP9_SUITE,03-deltaq,$(1),$(2)))
|
||||
$(eval $(call FATE_VP9_SUITE,06-bilinear,$(1),$(2)))
|
||||
$(eval $(call FATE_VP9_SUITE,09-lf_deltas,$(1),$(2)))
|
||||
$(eval $(call FATE_VP9_SUITE,10-show-existing-frame,$(1),$(2)))
|
||||
$(eval $(call FATE_VP9_SUITE,10-show-existing-frame2,$(1),$(2)))
|
||||
$(eval $(call FATE_VP9_SUITE,15-segkey_adpq,$(1),$(2)))
|
||||
$(eval $(call FATE_VP9_SUITE,16-intra-only,$(1),$(2)))
|
||||
$(eval $(call FATE_VP9_SUITE,2pass-akiyo,$(1),$(2)))
|
||||
$(eval $(call FATE_VP9_SUITE,parallelmode-akiyo,$(1),$(2)))
|
||||
$(eval $(call FATE_VP9_SUITE,segmentation-aq-akiyo,$(1),$(2)))
|
||||
$(eval $(call FATE_VP9_SUITE,segmentation-sf-akiyo,$(1),$(2)))
|
||||
$(eval $(call FATE_VP9_SUITE,tiling-pedestrian,$(1),$(2)))
|
||||
$(eval $(call FATE_VP9_SUITE,trac3849,$(1),$(2)))
|
||||
$(eval $(call FATE_VP9_SUITE,trac4359,$(1),$(2)))
|
||||
$(foreach Q,$(VP9_Q),$(eval $(call FATE_VP9_SUITE,00-quantizer-$(Q))))
|
||||
$(foreach SHARP,$(VP9_SHARP),$(eval $(call FATE_VP9_SUITE,01-sharpness-$(SHARP))))
|
||||
$(foreach W,$(VP9_SIZE_A),$(eval $(foreach H,$(VP9_SIZE_A),$(eval $(call FATE_VP9_SUITE,02-size-$(W)x$(H))))))
|
||||
$(foreach W,$(VP9_SIZE_B),$(eval $(foreach H,$(VP9_SIZE_B),$(eval $(call FATE_VP9_SUITE,03-size-$(W)x$(H))))))
|
||||
$(eval $(call FATE_VP9_SUITE,03-deltaq))
|
||||
$(eval $(call FATE_VP9_PROFILE_SUITE,04-yuv444,1))
|
||||
$(eval $(call FATE_VP9_PROFILE_SUITE,04-yuv440,1))
|
||||
$(eval $(call FATE_VP9_PROFILE_SUITE,04-yuv422,1))
|
||||
$(eval $(call FATE_VP9_SUITE,06-bilinear))
|
||||
$(eval $(call FATE_VP9_SUITE,09-lf_deltas))
|
||||
$(eval $(call FATE_VP9_SUITE,10-show-existing-frame))
|
||||
$(eval $(call FATE_VP9_SUITE,10-show-existing-frame2))
|
||||
$(eval $(call FATE_VP9_SUITE,15-segkey_adpq))
|
||||
$(eval $(call FATE_VP9_SUITE,16-intra-only))
|
||||
$(eval $(call FATE_VP9_SUITE,2pass-akiyo))
|
||||
$(eval $(call FATE_VP9_SUITE,parallelmode-akiyo))
|
||||
$(eval $(call FATE_VP9_SUITE,segmentation-aq-akiyo))
|
||||
$(eval $(call FATE_VP9_SUITE,segmentation-sf-akiyo))
|
||||
$(eval $(call FATE_VP9_SUITE,tiling-pedestrian))
|
||||
$(eval $(call FATE_VP9_SUITE,trac3849))
|
||||
$(eval $(call FATE_VP9_SUITE,trac4359))
|
||||
endef
|
||||
|
||||
$(eval $(call FATE_VP9_FULL))
|
||||
|
15
tests/ref/fate/vp9p1-04-yuv422
Normal file
15
tests/ref/fate/vp9p1-04-yuv422
Normal file
@ -0,0 +1,15 @@
|
||||
#format: frame checksums
|
||||
#version: 1
|
||||
#hash: MD5
|
||||
#tb 0: 1/50
|
||||
#stream#, dts, pts, duration, size, hash
|
||||
0, 0, 0, 1, 28800, b81b8a8444ac6ce4a4807c37e0a44c8b
|
||||
0, 1, 1, 1, 28800, 344458b82d35ea9944dc841643fc25c2
|
||||
0, 2, 2, 1, 28800, 376a4bb3944f052191963740b980eb26
|
||||
0, 3, 3, 1, 28800, 2fecb02c842bd7d588415904f2d3a82d
|
||||
0, 4, 4, 1, 28800, 0fda2f1dabba5c179599190f179b9782
|
||||
0, 5, 5, 1, 28800, a88ac885ee59e3a3a01fa483cdd40274
|
||||
0, 6, 6, 1, 28800, e76b488ffa70a05457fc046e7b999c56
|
||||
0, 7, 7, 1, 28800, 74ae5e52162f5bbc95258d44a2dd647c
|
||||
0, 8, 8, 1, 28800, 0c017e2b12e5192c8d598941d9c93306
|
||||
0, 9, 9, 1, 28800, ca3941ee43b7033cb48f8498af127d53
|
15
tests/ref/fate/vp9p1-04-yuv440
Normal file
15
tests/ref/fate/vp9p1-04-yuv440
Normal file
@ -0,0 +1,15 @@
|
||||
#format: frame checksums
|
||||
#version: 1
|
||||
#hash: MD5
|
||||
#tb 0: 1/50
|
||||
#stream#, dts, pts, duration, size, hash
|
||||
0, 0, 0, 1, 28800, 61157ad4fb02a254de8f34ae7b8915dc
|
||||
0, 1, 1, 1, 28800, 9431337382bf90d40aa417e297ac05da
|
||||
0, 2, 2, 1, 28800, 56b739049cc9e97a1d82018bba3db0ee
|
||||
0, 3, 3, 1, 28800, 75138a9b6bb905b2f79a1ebb959ddfea
|
||||
0, 4, 4, 1, 28800, 141b2fc9625fad86577838d84a276ef8
|
||||
0, 5, 5, 1, 28800, b364668c44a237d4e532e086a55401a9
|
||||
0, 6, 6, 1, 28800, a4ca6014d5194e4c921a4cb4289eb315
|
||||
0, 7, 7, 1, 28800, cfcacb3d5086d3861f4712a3c87a6b6c
|
||||
0, 8, 8, 1, 28800, 228d3fd3d849d021f3690cc538edb0a3
|
||||
0, 9, 9, 1, 28800, 97ecf281eb1130723d70e3c8803fa814
|
15
tests/ref/fate/vp9p1-04-yuv444
Normal file
15
tests/ref/fate/vp9p1-04-yuv444
Normal file
@ -0,0 +1,15 @@
|
||||
#format: frame checksums
|
||||
#version: 1
|
||||
#hash: MD5
|
||||
#tb 0: 1/25
|
||||
#stream#, dts, pts, duration, size, hash
|
||||
0, 0, 0, 1, 304128, 859df7b3661783e337a16ee79f3c20bc
|
||||
0, 1, 1, 1, 304128, 3b3ccf344cd5a478c4c1fa422497183d
|
||||
0, 2, 2, 1, 304128, 3be1f565823cb88013a14a93a3cf9480
|
||||
0, 3, 3, 1, 304128, 6e188a963deaf46c2d6e741b03c4240c
|
||||
0, 4, 4, 1, 304128, 82ead184ae478ac821b1b4b72f28c9cd
|
||||
0, 5, 5, 1, 304128, 59bb43badc76b39a228b1ad96b6339ca
|
||||
0, 6, 6, 1, 304128, 2eaee790fc188e2251b92dd4ea90c42a
|
||||
0, 7, 7, 1, 304128, 2a95f8727589e710dc1b95400916b72e
|
||||
0, 8, 8, 1, 304128, b7032f73544a7108fcdcaca2832ecc32
|
||||
0, 9, 9, 1, 304128, b7778c35b30bcc400b25ed0e5b7913e1
|
Loading…
x
Reference in New Issue
Block a user