videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

hevc/intra_pred: drop unnecessary conditions in loops 

Signed-off-by: Anton Khirnov <anton@khirnov.net>
This commit is contained in:
Mickaël Raulet 2014-05-17 21:59:08 +02:00 committed by Anton Khirnov
parent 4c390b1ba9
commit 25bb7eaf9e
1 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libavcodec/hevcpred_template.c
View File

@ -160,34 +160,25 @@ do { \
}
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);
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);
left[i] = POS(-1, i);
}
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);
top[i] = POS(i, -1);
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);
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);
top[i] = POS(i, -1);
}
if (s->pps->constrained_intra_pred_flag == 1) {