#include "libavutil/md5.h"
#include "avcodec.h"
+#include "bswapdsp.h"
#include "cabac.h"
-#include "dsputil.h"
#include "get_bits.h"
#include "hevcdsp.h"
#include "internal.h"
*/
#define SAMPLE(tab, x, y) ((tab)[(y) * s->sps->width + (x)])
#define SAMPLE_CTB(tab, x, y) ((tab)[(y) * min_cb_width + (x)])
-#define SAMPLE_CBF(tab, x, y) ((tab)[((y) & ((1<<log2_trafo_size)-1)) * MAX_CU_SIZE + ((x) & ((1<<log2_trafo_size)-1))])
#define IS_IDR(s) (s->nal_unit_type == NAL_IDR_W_RADL || s->nal_unit_type == NAL_IDR_N_LP)
#define IS_BLA(s) (s->nal_unit_type == NAL_BLA_W_RADL || s->nal_unit_type == NAL_BLA_W_LP || \
int *ctb_addr_ts_to_rs; ///< CtbAddrTSToRS
int *tile_id; ///< TileId
int *tile_pos_rs; ///< TilePosRS
- int *min_cb_addr_zs; ///< MinCbAddrZS
int *min_tb_addr_zs; ///< MinTbAddrZS
} HEVCPPS;
uint8_t colour_plane_id;
///< RPS coded in the slice header itself is stored here
+ int short_term_ref_pic_set_sps_flag;
+ int short_term_ref_pic_set_size;
ShortTermRPS slice_rps;
const ShortTermRPS *short_term_rps;
LongTermRPS long_term_rps;
enum PredMode pred_mode; ///< PredMode
enum PartMode part_mode; ///< PartMode
- uint8_t rqt_root_cbf;
-
- uint8_t pcm_flag;
-
// Inferred parameters
uint8_t intra_split_flag; ///< IntraSplitFlag
uint8_t max_trafo_depth; ///< MaxTrafoDepth
} Mv;
typedef struct MvField {
- Mv mv[2];
+ DECLARE_ALIGNED(4, Mv, mv)[2];
int8_t ref_idx[2];
int8_t pred_flag[2];
uint8_t is_intra;
uint8_t intra_pred_mode_c;
} PredictionUnit;
-typedef struct TransformTree {
- uint8_t cbf_cb[MAX_TRANSFORM_DEPTH][MAX_CU_SIZE * MAX_CU_SIZE];
- uint8_t cbf_cr[MAX_TRANSFORM_DEPTH][MAX_CU_SIZE * MAX_CU_SIZE];
- uint8_t cbf_luma;
-
- // Inferred parameters
- uint8_t inter_split_flag;
-} TransformTree;
-
typedef struct TransformUnit {
int cu_qp_delta;
AVBufferRef *rpl_tab_buf;
AVBufferRef *rpl_buf;
+ AVBufferRef *hwaccel_priv_buf;
+ void *hwaccel_picture_private;
+
/**
* A sequence counter, so that old frames are output first
* after a POC reset
int size;
const uint8_t *data;
+
+ int raw_size;
+ const uint8_t *raw_data;
} HEVCNAL;
struct HEVCContext;
GetBitContext gb;
CABACContext cc;
- TransformTree tt;
int8_t qp_y;
int8_t curr_qp_y;
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 {
HEVCPredContext hpc;
HEVCDSPContext hevcdsp;
VideoDSPContext vdsp;
- DSPContext dsp;
+ BswapDSPContext bdsp;
int8_t *qp_y_tab;
- uint8_t *split_cu_flag;
uint8_t *horizontal_bs;
uint8_t *vertical_bs;
int frame_packing_arrangement_type;
int content_interpretation_type;
int quincunx_subsampling;
+
+ /** display orientation */
+ int sei_display_orientation_present;
+ int sei_anticlockwise_rotation;
+ int sei_hflip, sei_vflip;
} HEVCContext;
int ff_hevc_decode_short_term_rps(HEVCContext *s, ShortTermRPS *rps,
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);