diff options
| author | Mickaël Raulet <mraulet@insa-rennes.fr> | 2014-07-27 22:56:06 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-28 00:39:13 +0200 |
| commit | 3b777db1320014286592706b7bb1c2e51364bb83 (patch) | |
| tree | 6cb82e62da373e43694722789adee365800566a9 | |
| parent | db0578a0e783eb9c25f4bdcaf0be0ab6dee48fcf (diff) | |
| download | ffmpeg-3b777db1320014286592706b7bb1c2e51364bb83.tar.gz | |
hevc: remove non necessary parameters to ff_hevc_set_qpy
cherry picked from commit 6f58c111ad9920d983bb18eacf901193bac5d937
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/hevc.c | 4 | ||||
| -rw-r--r-- | libavcodec/hevc.h | 2 | ||||
| -rw-r--r-- | libavcodec/hevc_filter.c | 8 |
3 files changed, 6 insertions, 8 deletions
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c index e71d39ce0b..727f3a5ee2 100644 --- a/libavcodec/hevc.c +++ b/libavcodec/hevc.c @@ -905,7 +905,7 @@ static int hls_transform_unit(HEVCContext *s, int x0, int y0, 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 && @@ -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) - 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; for (y = 0; y < length; y++) { diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h index bf0090f37c..de1b5eaf78 100644 --- a/libavcodec/hevc.h +++ b/libavcodec/hevc.h @@ -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 part_idx, int merge_idx, 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); void ff_hevc_deblocking_boundary_strengths(HEVCContext *s, int x0, int y0, int log2_trafo_size); diff --git a/libavcodec/hevc_filter.c b/libavcodec/hevc_filter.c index ac50333d29..a68d843429 100644 --- a/libavcodec/hevc_filter.c +++ b/libavcodec/hevc_filter.c @@ -76,8 +76,7 @@ static int chroma_tc(HEVCContext *s, int qp_y, int c_idx, int tc_offset) return tctable[idxt]; } -static int get_qPy_pred(HEVCContext *s, int xC, int yC, - int xBase, int yBase, int log2_cb_size) +static int get_qPy_pred(HEVCContext *s, int xBase, int yBase, int log2_cb_size) { HEVCLocalContext *lc = s->HEVClc; 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, return (qPy_a + qPy_b + 1) >> 1; } -void ff_hevc_set_qPy(HEVCContext *s, int xC, int yC, - int xBase, int yBase, int log2_cb_size) +void ff_hevc_set_qPy(HEVCContext *s, 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) { int off = s->sps->qp_bd_offset; |