int log2_size, int c_idx)
{
#define PU(x) \
- ((x) >> s->sps->log2_min_pu_size)
+ ((x) >> s->ps.sps->log2_min_pu_size)
#define MVF(x, y) \
(s->ref->tab_mvf[(x) + (y) * min_pu_width])
#define MVF_PU(x, y) \
#define IS_INTRA(x, y) \
MVF_PU(x, y).is_intra
#define MIN_TB_ADDR_ZS(x, y) \
- s->pps->min_tb_addr_zs[(y) * s->sps->min_tb_width + (x)]
-#define EXTEND_LEFT(ptr, start, length) \
- for (i = (start); i > (start) - (length); i--) \
- ptr[i - 1] = ptr[i]
-#define EXTEND_RIGHT(ptr, start, length) \
- for (i = (start); i < (start) + (length); i++) \
- ptr[i] = ptr[i - 1]
-#define EXTEND_UP(ptr, start, length) EXTEND_LEFT(ptr, start, length)
-#define EXTEND_DOWN(ptr, start, length) EXTEND_RIGHT(ptr, start, length)
+ s->ps.pps->min_tb_addr_zs[(y) * s->ps.sps->min_tb_width + (x)]
+
+#define EXTEND(ptr, val, len) \
+do { \
+ pixel4 pix = PIXEL_SPLAT_X4(val); \
+ for (i = 0; i < (len); i += 4) \
+ AV_WN4P(ptr + i, pix); \
+} while (0)
+
#define EXTEND_LEFT_CIP(ptr, start, length) \
for (i = (start); i > (start) - (length); i--) \
if (!IS_INTRA(i - 1, -1)) \
ptr[i] = ptr[i - 1]
HEVCLocalContext *lc = &s->HEVClc;
int i;
- int hshift = s->sps->hshift[c_idx];
- int vshift = s->sps->vshift[c_idx];
+ int hshift = s->ps.sps->hshift[c_idx];
+ int vshift = s->ps.sps->vshift[c_idx];
int size = (1 << log2_size);
int size_in_luma = size << hshift;
- int size_in_tbs = size_in_luma >> s->sps->log2_min_tb_size;
+ int size_in_tbs = size_in_luma >> s->ps.sps->log2_min_tb_size;
int x = x0 >> hshift;
int y = y0 >> vshift;
- int x_tb = x0 >> s->sps->log2_min_tb_size;
- int y_tb = y0 >> s->sps->log2_min_tb_size;
+ int x_tb = x0 >> s->ps.sps->log2_min_tb_size;
+ int y_tb = y0 >> s->ps.sps->log2_min_tb_size;
int cur_tb_addr = MIN_TB_ADDR_ZS(x_tb, y_tb);
ptrdiff_t stride = s->frame->linesize[c_idx] / sizeof(pixel);
pixel *src = (pixel*)s->frame->data[c_idx] + x + y * stride;
- int min_pu_width = s->sps->min_pu_width;
+ int min_pu_width = s->ps.sps->min_pu_width;
enum IntraPredMode mode = c_idx ? lc->pu.intra_pred_mode_c :
lc->tu.cur_intra_pred_mode;
int cand_up = lc->na.cand_up;
int cand_up_right = lc->na.cand_up_right && cur_tb_addr > MIN_TB_ADDR_ZS(x_tb + size_in_tbs, y_tb - 1);
- int bottom_left_size = (FFMIN(y0 + 2 * size_in_luma, s->sps->height) -
+ int bottom_left_size = (FFMIN(y0 + 2 * size_in_luma, s->ps.sps->height) -
(y0 + size_in_luma)) >> vshift;
- int top_right_size = (FFMIN(x0 + 2 * size_in_luma, s->sps->width) -
+ int top_right_size = (FFMIN(x0 + 2 * size_in_luma, s->ps.sps->width) -
(x0 + size_in_luma)) >> hshift;
- if (s->pps->constrained_intra_pred_flag == 1) {
+ if (s->ps.pps->constrained_intra_pred_flag == 1) {
int size_in_luma_pu = PU(size_in_luma);
- int on_pu_edge_x = !(x0 & ((1 << s->sps->log2_min_pu_size) - 1));
- int on_pu_edge_y = !(y0 & ((1 << s->sps->log2_min_pu_size) - 1));
+ int on_pu_edge_x = !(x0 & ((1 << s->ps.sps->log2_min_pu_size) - 1));
+ int on_pu_edge_y = !(y0 & ((1 << s->ps.sps->log2_min_pu_size) - 1));
if (!size_in_luma_pu)
size_in_luma_pu++;
if (cand_bottom_left == 1 && on_pu_edge_x) {
int x_left_pu = PU(x0 - 1);
int y_bottom_pu = PU(y0 + size_in_luma);
- int max = FFMIN(size_in_luma_pu, s->sps->min_pu_height - y_bottom_pu);
+ int max = FFMIN(size_in_luma_pu, s->ps.sps->min_pu_height - y_bottom_pu);
cand_bottom_left = 0;
for (i = 0; i < max; i++)
cand_bottom_left |= MVF(x_left_pu, y_bottom_pu + i).is_intra;
if (cand_left == 1 && on_pu_edge_x) {
int x_left_pu = PU(x0 - 1);
int y_left_pu = PU(y0);
- int max = FFMIN(size_in_luma_pu, s->sps->min_pu_height - y_left_pu);
+ int max = FFMIN(size_in_luma_pu, s->ps.sps->min_pu_height - y_left_pu);
cand_left = 0;
for (i = 0; i < max; i++)
cand_left |= MVF(x_left_pu, y_left_pu + i).is_intra;
if (cand_up == 1 && on_pu_edge_y) {
int x_top_pu = PU(x0);
int y_top_pu = PU(y0 - 1);
- int max = FFMIN(size_in_luma_pu, s->sps->min_pu_width - x_top_pu);
+ int max = FFMIN(size_in_luma_pu, s->ps.sps->min_pu_width - x_top_pu);
cand_up = 0;
for (i = 0; i < max; i++)
cand_up |= MVF(x_top_pu + i, y_top_pu).is_intra;
if (cand_up_right == 1 && on_pu_edge_y) {
int y_top_pu = PU(y0 - 1);
int x_right_pu = PU(x0 + size_in_luma);
- int max = FFMIN(size_in_luma_pu, s->sps->min_pu_width - x_right_pu);
+ int max = FFMIN(size_in_luma_pu, s->ps.sps->min_pu_width - x_right_pu);
cand_up_right = 0;
for (i = 0; i < max; i++)
cand_up_right |= MVF(x_right_pu + i, y_top_pu).is_intra;
}
}
if (cand_bottom_left) {
- for (i = size + bottom_left_size; i < (size << 1); i++)
- if (IS_INTRA(-1, size + bottom_left_size - 1) ||
- !s->pps->constrained_intra_pred_flag)
- left[i] = POS(-1, size + bottom_left_size - 1);
- for (i = size + bottom_left_size - 1; i >= size; i--)
- if (IS_INTRA(-1, i) || !s->pps->constrained_intra_pred_flag)
- left[i] = POS(-1, i);
+ for (i = size; i < size + bottom_left_size; i++)
+ left[i] = POS(-1, i);
+ EXTEND(left + size + bottom_left_size, POS(-1, size + bottom_left_size - 1),
+ size - bottom_left_size);
}
if (cand_left)
for (i = size - 1; i >= 0; i--)
- if (IS_INTRA(-1, i) || !s->pps->constrained_intra_pred_flag)
- left[i] = POS(-1, i);
- if (cand_up_left)
- if (IS_INTRA(-1, -1) || !s->pps->constrained_intra_pred_flag) {
- left[-1] = POS(-1, -1);
- top[-1] = left[-1];
- }
+ left[i] = POS(-1, i);
+ if (cand_up_left) {
+ left[-1] = POS(-1, -1);
+ top[-1] = left[-1];
+ }
if (cand_up)
- for (i = size - 1; i >= 0; i--)
- if (IS_INTRA(i, -1) || !s->pps->constrained_intra_pred_flag)
- top[i] = POS(i, -1);
+ memcpy(top, src - stride, size * sizeof(pixel));
if (cand_up_right) {
- for (i = size + top_right_size; i < (size << 1); i++)
- if (IS_INTRA(size + top_right_size - 1, -1) ||
- !s->pps->constrained_intra_pred_flag)
- top[i] = POS(size + top_right_size - 1, -1);
- for (i = size + top_right_size - 1; i >= size; i--)
- if (IS_INTRA(i, -1) || !s->pps->constrained_intra_pred_flag)
- top[i] = POS(i, -1);
+ memcpy(top + size, src - stride + size, size * sizeof(pixel));
+ EXTEND(top + size + top_right_size, POS(size + top_right_size - 1, -1),
+ size - top_right_size);
}
- if (s->pps->constrained_intra_pred_flag == 1) {
+ if (s->ps.pps->constrained_intra_pred_flag == 1) {
if (cand_bottom_left || cand_left || cand_up_left || cand_up || cand_up_right) {
- int size_max_x = x0 + ((2 * size) << hshift) < s->sps->width ?
- 2 * size : (s->sps->width - x0) >> hshift;
- int size_max_y = y0 + ((2 * size) << vshift) < s->sps->height ?
- 2 * size : (s->sps->height - y0) >> vshift;
+ int size_max_x = x0 + ((2 * size) << hshift) < s->ps.sps->width ?
+ 2 * size : (s->ps.sps->width - x0) >> hshift;
+ int size_max_y = y0 + ((2 * size) << vshift) < s->ps.sps->height ?
+ 2 * size : (s->ps.sps->height - y0) >> vshift;
int j = size + (cand_bottom_left? bottom_left_size: 0) -1;
if (!cand_up_right) {
- size_max_x = x0 + ((size) << hshift) < s->sps->width ?
- size : (s->sps->width - x0) >> hshift;
+ size_max_x = x0 + ((size) << hshift) < s->ps.sps->width ?
+ size : (s->ps.sps->width - x0) >> hshift;
}
if (!cand_bottom_left) {
- size_max_y = y0 + (( size) << vshift) < s->sps->height ?
- size : (s->sps->height - y0) >> vshift;
+ size_max_y = y0 + (( size) << vshift) < s->ps.sps->height ?
+ size : (s->ps.sps->height - y0) >> vshift;
}
if (cand_bottom_left || cand_left || cand_up_left) {
while (j > -1 && !IS_INTRA(-1, j))
if (cand_bottom_left || cand_left) {
EXTEND_DOWN_CIP(left, j, size_max_y - j);
}
- if (!cand_left) {
- EXTEND_DOWN(left, 0, size);
- }
- if (!cand_bottom_left) {
- EXTEND_DOWN(left, size, size);
- }
+ if (!cand_left)
+ EXTEND(left, left[-1], size);
+ if (!cand_bottom_left)
+ EXTEND(left + size, left[size - 1], size);
if (x0 != 0 && y0 != 0) {
EXTEND_UP_CIP(left, size_max_y - 1, size_max_y);
} else if (x0 == 0) {
// Infer the unavailable samples
if (!cand_bottom_left) {
if (cand_left) {
- EXTEND_DOWN(left, size, size);
+ EXTEND(left + size, left[size - 1], size);
} else if (cand_up_left) {
- EXTEND_DOWN(left, 0, 2 * size);
+ EXTEND(left, left[-1], 2 * size);
cand_left = 1;
} else if (cand_up) {
left[-1] = top[0];
- EXTEND_DOWN(left, 0, 2 * size);
+ EXTEND(left, left[-1], 2 * size);
cand_up_left = 1;
cand_left = 1;
} else if (cand_up_right) {
- EXTEND_LEFT(top, size, size);
- left[-1] = top[0];
- EXTEND_DOWN(left, 0, 2 * size);
+ EXTEND(top, top[size], size);
+ left[-1] = top[size];
+ EXTEND(left, left[-1], 2 * size);
cand_up = 1;
cand_up_left = 1;
cand_left = 1;
} else { // No samples available
- top[0] = left[-1] = (1 << (BIT_DEPTH - 1));
- EXTEND_RIGHT(top, 1, 2 * size - 1);
- EXTEND_DOWN(left, 0, 2 * size);
+ left[-1] = (1 << (BIT_DEPTH - 1));
+ EXTEND(top, left[-1], 2 * size);
+ EXTEND(left, left[-1], 2 * size);
}
}
- if (!cand_left) {
- EXTEND_UP(left, size, size);
- }
+ if (!cand_left)
+ EXTEND(left, left[size], size);
if (!cand_up_left) {
left[-1] = left[0];
}
- if (!cand_up) {
- top[0] = left[-1];
- EXTEND_RIGHT(top, 1, size - 1);
- }
- if (!cand_up_right) {
- EXTEND_RIGHT(top, size, size);
- }
+ if (!cand_up)
+ EXTEND(top, left[-1], size);
+ if (!cand_up_right)
+ EXTEND(top + size, top[size - 1], size);
top[-1] = left[-1];
FFABS((int)mode - 10));
if (min_dist_vert_hor > intra_hor_ver_dist_thresh[log2_size - 3]) {
int threshold = 1 << (BIT_DEPTH - 5);
- if (s->sps->sps_strong_intra_smoothing_enable_flag &&
+ if (s->ps.sps->sps_strong_intra_smoothing_enable_flag &&
log2_size == 5 &&
FFABS(top[-1] + top[63] - 2 * top[31]) < threshold &&
FFABS(left[-1] + left[63] - 2 * left[31]) < threshold) {
#undef MVF_PU
#undef MVF
#undef PU
-#undef EXTEND_LEFT
-#undef EXTEND_RIGHT
-#undef EXTEND_UP
-#undef EXTEND_DOWN
+#undef EXTEND
#undef MIN_TB_ADDR_ZS
#undef POS
projects / ffmpeg / blobdiff