diff options
| author | Mickaël Raulet <mraulet@insa-rennes.fr> | 2014-05-17 21:59:08 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2014-05-19 07:12:47 +0200 |
| commit | 25bb7eaf9eb14e6e00264bf584aa4d380d3bc29f (patch) | |
| tree | 256c7a305a86e2202deebdfad1afdaf8e519f2ed | |
| parent | 4c390b1ba98e6aec787aa0e7ea57ed7cb38283b7 (diff) | |
| download | ffmpeg-25bb7eaf9eb14e6e00264bf584aa4d380d3bc29f.tar.gz | |
hevc/intra_pred: drop unnecessary conditions in loops
Signed-off-by: Anton Khirnov <anton@khirnov.net>
| -rw-r--r-- | libavcodec/hevcpred_template.c | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/libavcodec/hevcpred_template.c b/libavcodec/hevcpred_template.c index b118012040..8e80f81375 100644 --- a/libavcodec/hevcpred_template.c +++ b/libavcodec/hevcpred_template.c @@ -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) { |