diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-10 21:32:05 +0100 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2014-01-21 11:57:43 +0100 |
| commit | d5c15ebeaf1914ea5e3e0599d4316d7c4cf74434 (patch) | |
| tree | 9bcc7137c1cc71b0e6819b5bbed0607de9457eaa /libavcodec | |
| parent | a7a07cc98ac548297b5b0628cb81280e11952e3f (diff) | |
hevc: Fix modulo operations
Keep qp fields within the range.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/hevc.c | 4 | ||||
| -rw-r--r-- | libavcodec/hevc.h | 3 | ||||
| -rw-r--r-- | libavcodec/hevc_filter.c | 4 |
3 files changed, 7 insertions, 4 deletions
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c index 438794ded7..d5175f52d2 100644 --- a/libavcodec/hevc.c +++ b/libavcodec/hevc.c @@ -771,8 +771,8 @@ static int hls_slice_header(HEVCContext *s) s->HEVClc.first_qp_group = !s->sh.dependent_slice_segment_flag; if (!s->pps->cu_qp_delta_enabled_flag) - s->HEVClc.qp_y = ((s->sh.slice_qp + 52 + 2 * s->sps->qp_bd_offset) % - (52 + s->sps->qp_bd_offset)) - s->sps->qp_bd_offset; + s->HEVClc.qp_y = FFUMOD(s->sh.slice_qp + 52 + 2 * s->sps->qp_bd_offset, + 52 + s->sps->qp_bd_offset) - s->sps->qp_bd_offset; s->slice_initialized = 1; diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h index 07d70739de..f623887c6e 100644 --- a/libavcodec/hevc.h +++ b/libavcodec/hevc.h @@ -85,6 +85,9 @@ s->nal_unit_type == NAL_BLA_N_LP) #define IS_IRAP(s) (s->nal_unit_type >= 16 && s->nal_unit_type <= 23) +#define FFUDIV(a,b) (((a) > 0 ? (a) : (a) - (b) + 1) / (b)) +#define FFUMOD(a,b) ((a) - (b) * FFUDIV(a,b)) + /** * Table 7-3: NAL unit type codes */ diff --git a/libavcodec/hevc_filter.c b/libavcodec/hevc_filter.c index bb1e360dd4..f3c655416a 100644 --- a/libavcodec/hevc_filter.c +++ b/libavcodec/hevc_filter.c @@ -158,8 +158,8 @@ void ff_hevc_set_qPy(HEVCContext *s, int xC, int yC, if (s->HEVClc.tu.cu_qp_delta != 0) { int off = s->sps->qp_bd_offset; - s->HEVClc.qp_y = ((qp_y + s->HEVClc.tu.cu_qp_delta + 52 + 2 * off) % - (52 + off)) - off; + s->HEVClc.qp_y = FFUMOD(qp_y + s->HEVClc.tu.cu_qp_delta + 52 + 2 * off, + 52 + off) - off; } else s->HEVClc.qp_y = qp_y; } |