From 70211539a39ca3854f8a9e97d51dc27caa079943 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sun, 27 Jul 2014 17:49:09 +0000 Subject: hevc: deobfuscate slice/tile boundary handling for DBF Use named constants instead of magic numbers, avoid using variables with inverse meaning from what their name implies. --- libavcodec/hevc.h | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'libavcodec/hevc.h') diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h index 96dd80d4b1..03980b729c 100644 --- a/libavcodec/hevc.h +++ b/libavcodec/hevc.h @@ -740,8 +740,13 @@ typedef struct HEVCLocalContext { PredictionUnit pu; NeighbourAvailable na; - uint8_t slice_or_tiles_left_boundary; - uint8_t slice_or_tiles_up_boundary; +#define BOUNDARY_LEFT_SLICE (1 << 0) +#define BOUNDARY_LEFT_TILE (1 << 1) +#define BOUNDARY_UPPER_SLICE (1 << 2) +#define BOUNDARY_UPPER_TILE (1 << 3) + /* properties of the boundary of the current CTB for the purposes + * of the deblocking filter */ + int boundary_flags; } HEVCLocalContext; typedef struct HEVCContext { @@ -970,9 +975,7 @@ void ff_hevc_luma_mv_mvp_mode(HEVCContext *s, int x0, int y0, void ff_hevc_set_qPy(HEVCContext *s, int xC, int yC, int xBase, int yBase, int log2_cb_size); void ff_hevc_deblocking_boundary_strengths(HEVCContext *s, int x0, int y0, - int log2_trafo_size, - int slice_or_tiles_up_boundary, - int slice_or_tiles_left_boundary); + int log2_trafo_size); int ff_hevc_cu_qp_delta_sign_flag(HEVCContext *s); int ff_hevc_cu_qp_delta_abs(HEVCContext *s); void ff_hevc_hls_filter(HEVCContext *s, int x, int y); -- cgit v1.2.3