| @@ -549,8 +549,8 @@ static void deblocking_filter_CTB(const HEVCContext *s, const HEVCLayerContext * · 548 unmodified lines |
| 549 | for (y = y0; y < y_end; y += 8) { | 549 | for (y = y0; y < y_end; y += 8) { |
| 550 | // vertical filtering luma | 550 | // vertical filtering luma |
| 551 | for (x = x0 ? x0 : 8; x < x_end; x += 8) { | 551 | for (x = x0 ? x0 : 8; x < x_end; x += 8) { |
| 552 | const int bs0 = s->vertical_bs[(x + y * l->bs_width) >> 2]; | 552 | const int bs0 = l->vertical_bs[(x + y * l->bs_width) >> 2]; |
| 553 | const int bs1 = s->vertical_bs[(x + (y + 4) * l->bs_width) >> 2]; | 553 | const int bs1 = l->vertical_bs[(x + (y + 4) * l->bs_width) >> 2]; |
| 554 | if (bs0 || bs1) { | 554 | if (bs0 || bs1) { |
| 555 | const int qp = (get_qPy(sps, l->qp_y_tab, x - 1, y) + | 555 | const int qp = (get_qPy(sps, l->qp_y_tab, x - 1, y) + |
| 556 | get_qPy(sps, l->qp_y_tab, x, y) + 1) >> 1; | 556 | get_qPy(sps, l->qp_y_tab, x, y) + 1) >> 1; |
| @@ -578,8 +578,8 @@ static void deblocking_filter_CTB(const HEVCContext *s, const HEVCLayerContext * · 21 unmodified lines |
| 578 | | 578 | |
| 579 | // horizontal filtering luma | 579 | // horizontal filtering luma |
| 580 | for (x = x0 ? x0 - 8 : 0; x < x_end2; x += 8) { | 580 | for (x = x0 ? x0 - 8 : 0; x < x_end2; x += 8) { |
| 581 | const int bs0 = s->horizontal_bs[( x + y * l->bs_width) >> 2]; | 581 | const int bs0 = l->horizontal_bs[( x + y * l->bs_width) >> 2]; |
| 582 | const int bs1 = s->horizontal_bs[((x + 4) + y * l->bs_width) >> 2]; | 582 | const int bs1 = l->horizontal_bs[((x + 4) + y * l->bs_width) >> 2]; |
| 583 | if (bs0 || bs1) { | 583 | if (bs0 || bs1) { |
| 584 | const int qp = (get_qPy(sps, l->qp_y_tab, x, y - 1) + | 584 | const int qp = (get_qPy(sps, l->qp_y_tab, x, y - 1) + |
| 585 | get_qPy(sps, l->qp_y_tab, x, y) + 1) >> 1; | 585 | get_qPy(sps, l->qp_y_tab, x, y) + 1) >> 1; |
| @@ -613,8 +613,8 @@ static void deblocking_filter_CTB(const HEVCContext *s, const HEVCLayerContext * · 27 unmodified lines |
| 613 | // vertical filtering chroma | 613 | // vertical filtering chroma |
| 614 | for (y = y0; y < y_end; y += (8 * v)) { | 614 | for (y = y0; y < y_end; y += (8 * v)) { |
| 615 | for (x = x0 ? x0 : 8 * h; x < x_end; x += (8 * h)) { | 615 | for (x = x0 ? x0 : 8 * h; x < x_end; x += (8 * h)) { |
| 616 | const int bs0 = s->vertical_bs[(x + y * l->bs_width) >> 2]; | 616 | const int bs0 = l->vertical_bs[(x + y * l->bs_width) >> 2]; |
| 617 | const int bs1 = s->vertical_bs[(x + (y + (4 * v)) * l->bs_width) >> 2]; | 617 | const int bs1 = l->vertical_bs[(x + (y + (4 * v)) * l->bs_width) >> 2]; |
| 618 | | 618 | |
| 619 | if ((bs0 == 2) || (bs1 == 2)) { | 619 | if ((bs0 == 2) || (bs1 == 2)) { |
| 620 | const int qp0 = (get_qPy(sps, l->qp_y_tab, x - 1, y) + | 620 | const int qp0 = (get_qPy(sps, l->qp_y_tab, x - 1, y) + |
| @@ -647,8 +647,8 @@ static void deblocking_filter_CTB(const HEVCContext *s, const HEVCLayerContext * · 26 unmodified lines |
| 647 | if (x_end != sps->width) | 647 | if (x_end != sps->width) |
| 648 | x_end2 = x_end - 8 * h; | 648 | x_end2 = x_end - 8 * h; |
| 649 | for (x = x0 ? x0 - 8 * h : 0; x < x_end2; x += (8 * h)) { | 649 | for (x = x0 ? x0 - 8 * h : 0; x < x_end2; x += (8 * h)) { |
| 650 | const int bs0 = s->horizontal_bs[( x + y * l->bs_width) >> 2]; | 650 | const int bs0 = l->horizontal_bs[( x + y * l->bs_width) >> 2]; |
| 651 | const int bs1 = s->horizontal_bs[((x + 4 * h) + y * l->bs_width) >> 2]; | 651 | const int bs1 = l->horizontal_bs[((x + 4 * h) + y * l->bs_width) >> 2]; |
| 652 | if ((bs0 == 2) || (bs1 == 2)) { | 652 | if ((bs0 == 2) || (bs1 == 2)) { |
| 653 | const int qp0 = bs0 == 2 ? (get_qPy(sps, l->qp_y_tab, x, y - 1) + | 653 | const int qp0 = bs0 == 2 ? (get_qPy(sps, l->qp_y_tab, x, y - 1) + |
| 654 | get_qPy(sps, l->qp_y_tab, x, y) + 1) >> 1 : 0; | 654 | get_qPy(sps, l->qp_y_tab, x, y) + 1) >> 1 : 0; |
| @@ -788,7 +788,7 @@ void ff_hevc_deblocking_boundary_strengths(HEVCLocalContext *lc, const HEVCLayer · 133 unmodified lines |
| 788 | bs = 1; | 788 | bs = 1; |
| 789 | else | 789 | else |
| 790 | bs = boundary_strength(s, curr, top, rpl_top); | 790 | bs = boundary_strength(s, curr, top, rpl_top); |
| 791 | s->horizontal_bs[((x0 + i) + y0 * l->bs_width) >> 2] = bs; | 791 | l->horizontal_bs[((x0 + i) + y0 * l->bs_width) >> 2] = bs; |
| 792 | } | 792 | } |
| 793 | } | 793 | } |
| 794 | | 794 | |
| @@ -826,7 +826,7 @@ void ff_hevc_deblocking_boundary_strengths(HEVCLocalContext *lc, const HEVCLayer · 31 unmodified lines |
| 826 | bs = 1; | 826 | bs = 1; |
| 827 | else | 827 | else |
| 828 | bs = boundary_strength(s, curr, left, rpl_left); | 828 | bs = boundary_strength(s, curr, left, rpl_left); |
| 829 | s->vertical_bs[(x0 + (y0 + i) * l->bs_width) >> 2] = bs; | 829 | l->vertical_bs[(x0 + (y0 + i) * l->bs_width) >> 2] = bs; |
| 830 | } | 830 | } |
| 831 | } | 831 | } |
| 832 | | 832 | |
| @@ -844,7 +844,7 @@ void ff_hevc_deblocking_boundary_strengths(HEVCLocalContext *lc, const HEVCLayer · 11 unmodified lines |
| 844 | const MvField *curr = &tab_mvf[yq_pu * min_pu_width + x_pu]; | 844 | const MvField *curr = &tab_mvf[yq_pu * min_pu_width + x_pu]; |
| 845 | | 845 | |
| 846 | bs = boundary_strength(s, curr, top, rpl); | 846 | bs = boundary_strength(s, curr, top, rpl); |
| 847 | s->horizontal_bs[((x0 + i) + (y0 + j) * l->bs_width) >> 2] = bs; | 847 | l->horizontal_bs[((x0 + i) + (y0 + j) * l->bs_width) >> 2] = bs; |
| 848 | } | 848 | } |
| 849 | } | 849 | } |
| 850 | | 850 | |
| @@ -859,7 +859,7 @@ void ff_hevc_deblocking_boundary_strengths(HEVCLocalContext *lc, const HEVCLayer · 8 unmodified lines |
| 859 | const MvField *curr = &tab_mvf[y_pu * min_pu_width + xq_pu]; | 859 | const MvField *curr = &tab_mvf[y_pu * min_pu_width + xq_pu]; |
| 860 | | 860 | |
| 861 | bs = boundary_strength(s, curr, left, rpl); | 861 | bs = boundary_strength(s, curr, left, rpl); |
| 862 | s->vertical_bs[((x0 + i) + (y0 + j) * l->bs_width) >> 2] = bs; | 862 | l->vertical_bs[((x0 + i) + (y0 + j) * l->bs_width) >> 2] = bs; |
| 863 | } | 863 | } |
| 864 | } | 864 | } |
| 865 | } | 865 | } |