Commit 3b777db1 authored by Mickaël Raulet's avatar Mickaël Raulet Committed by Michael Niedermayer

hevc: remove non necessary parameters to ff_hevc_set_qpy

cherry picked from commit 6f58c111ad9920d983bb18eacf901193bac5d937
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent db0578a0
...@@ -905,7 +905,7 @@ static int hls_transform_unit(HEVCContext *s, int x0, int y0, ...@@ -905,7 +905,7 @@ static int hls_transform_unit(HEVCContext *s, int x0, int y0,
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
ff_hevc_set_qPy(s, x0, y0, cb_xBase, cb_yBase, log2_cb_size); ff_hevc_set_qPy(s, cb_xBase, cb_yBase, log2_cb_size);
} }
if (s->sh.cu_chroma_qp_offset_enabled_flag && cbf_chroma && if (s->sh.cu_chroma_qp_offset_enabled_flag && cbf_chroma &&
...@@ -2115,7 +2115,7 @@ static int hls_coding_unit(HEVCContext *s, int x0, int y0, int log2_cb_size) ...@@ -2115,7 +2115,7 @@ static int hls_coding_unit(HEVCContext *s, int x0, int y0, int log2_cb_size)
} }
if (s->pps->cu_qp_delta_enabled_flag && lc->tu.is_cu_qp_delta_coded == 0) if (s->pps->cu_qp_delta_enabled_flag && lc->tu.is_cu_qp_delta_coded == 0)
ff_hevc_set_qPy(s, x0, y0, x0, y0, log2_cb_size); ff_hevc_set_qPy(s, x0, y0, log2_cb_size);
x = y_cb * min_cb_width + x_cb; x = y_cb * min_cb_width + x_cb;
for (y = 0; y < length; y++) { for (y = 0; y < length; y++) {
......
...@@ -1030,7 +1030,7 @@ void ff_hevc_luma_mv_mvp_mode(HEVCContext *s, int x0, int y0, ...@@ -1030,7 +1030,7 @@ void ff_hevc_luma_mv_mvp_mode(HEVCContext *s, int x0, int y0,
int nPbW, int nPbH, int log2_cb_size, int nPbW, int nPbH, int log2_cb_size,
int part_idx, int merge_idx, int part_idx, int merge_idx,
MvField *mv, int mvp_lx_flag, int LX); MvField *mv, int mvp_lx_flag, int LX);
void ff_hevc_set_qPy(HEVCContext *s, int xC, int yC, int xBase, int yBase, void ff_hevc_set_qPy(HEVCContext *s, int xBase, int yBase,
int log2_cb_size); int log2_cb_size);
void ff_hevc_deblocking_boundary_strengths(HEVCContext *s, int x0, int y0, void ff_hevc_deblocking_boundary_strengths(HEVCContext *s, int x0, int y0,
int log2_trafo_size); int log2_trafo_size);
......
...@@ -76,8 +76,7 @@ static int chroma_tc(HEVCContext *s, int qp_y, int c_idx, int tc_offset) ...@@ -76,8 +76,7 @@ static int chroma_tc(HEVCContext *s, int qp_y, int c_idx, int tc_offset)
return tctable[idxt]; return tctable[idxt];
} }
static int get_qPy_pred(HEVCContext *s, int xC, int yC, static int get_qPy_pred(HEVCContext *s, int xBase, int yBase, int log2_cb_size)
int xBase, int yBase, int log2_cb_size)
{ {
HEVCLocalContext *lc = s->HEVClc; HEVCLocalContext *lc = s->HEVClc;
int ctb_size_mask = (1 << s->sps->log2_ctb_size) - 1; int ctb_size_mask = (1 << s->sps->log2_ctb_size) - 1;
...@@ -120,10 +119,9 @@ static int get_qPy_pred(HEVCContext *s, int xC, int yC, ...@@ -120,10 +119,9 @@ static int get_qPy_pred(HEVCContext *s, int xC, int yC,
return (qPy_a + qPy_b + 1) >> 1; return (qPy_a + qPy_b + 1) >> 1;
} }
void ff_hevc_set_qPy(HEVCContext *s, int xC, int yC, void ff_hevc_set_qPy(HEVCContext *s, int xBase, int yBase, int log2_cb_size)
int xBase, int yBase, int log2_cb_size)
{ {
int qp_y = get_qPy_pred(s, xC, yC, xBase, yBase, log2_cb_size); int qp_y = get_qPy_pred(s, xBase, yBase, log2_cb_size);
if (s->HEVClc->tu.cu_qp_delta != 0) { if (s->HEVClc->tu.cu_qp_delta != 0) {
int off = s->sps->qp_bd_offset; int off = s->sps->qp_bd_offset;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment