Skip to content

F
ffmpeg.wasm-core
Commit be545b8a authored by Diego Biurrun's avatar Diego Biurrun
Browse files
Options

h264: K&R formatting cosmetics for header files (part I/II)

parent d55961fa
Hide whitespace changes
Inline Side-by-side
Showing with 491 additions and 458 deletions
libavcodec/h264.h
View file @ be545b8a
...@@ -37,14 +37,14 @@ ...@@ -37,14 +37,14 @@
#include "rectangle.h" #include "rectangle.h"
#define interlaced_dct interlaced_dct_is_a_bad_name #define interlaced_dct interlaced_dct_is_a_bad_name
#define mb_intra mb_intra_is_not_initialized_see_mb_type #define mb_intra mb_intra_is_not_initialized_see_mb_type
#define MAX_SPS_COUNT 32 #define MAX_SPS_COUNT 32
#define MAX_PPS_COUNT 256 #define MAX_PPS_COUNT 256
#define MAX_MMCO_COUNT 66 #define MAX_MMCO_COUNT 66
#define MAX_DELAYED_PIC_COUNT 16 #define MAX_DELAYED_PIC_COUNT 16
/* Compiling in interlaced support reduces the speed /* Compiling in interlaced support reduces the speed
* of progressive decoding by about 2%. */ * of progressive decoding by about 2%. */
...@@ -59,25 +59,25 @@ ...@@ -59,25 +59,25 @@
#define MAX_SLICES 16 #define MAX_SLICES 16
#ifdef ALLOW_INTERLACE #ifdef ALLOW_INTERLACE
#define MB_MBAFF h->mb_mbaff #define MB_MBAFF h->mb_mbaff
#define MB_FIELD h->mb_field_decoding_flag #define MB_FIELD h->mb_field_decoding_flag
#define FRAME_MBAFF h->mb_aff_frame #define FRAME_MBAFF h->mb_aff_frame
#define FIELD_PICTURE (s->picture_structure != PICT_FRAME) #define FIELD_PICTURE (s->picture_structure != PICT_FRAME)
#define LEFT_MBS 2 #define LEFT_MBS 2
#define LTOP 0 #define LTOP 0
#define LBOT 1 #define LBOT 1
#define LEFT(i) (i) #define LEFT(i) (i)
#else #else
#define MB_MBAFF 0 #define MB_MBAFF 0
#define MB_FIELD 0 #define MB_FIELD 0
#define FRAME_MBAFF 0 #define FRAME_MBAFF 0
#define FIELD_PICTURE 0 #define FIELD_PICTURE 0
#undef IS_INTERLACED #undef IS_INTERLACED
#define IS_INTERLACED(mb_type) 0 #define IS_INTERLACED(mb_type) 0
#define LEFT_MBS 1 #define LEFT_MBS 1
#define LTOP 0 #define LTOP 0
#define LBOT 0 #define LBOT 0
#define LEFT(i) 0 #define LEFT(i) 0
#endif #endif
#define FIELD_OR_MBAFF_PICTURE (FRAME_MBAFF || FIELD_PICTURE) #define FIELD_OR_MBAFF_PICTURE (FRAME_MBAFF || FIELD_PICTURE)
...@@ -88,9 +88,9 @@ ...@@ -88,9 +88,9 @@
#define CHROMA422 (h->sps.chroma_format_idc == 2) #define CHROMA422 (h->sps.chroma_format_idc == 2)
#define CHROMA444 (h->sps.chroma_format_idc == 3) #define CHROMA444 (h->sps.chroma_format_idc == 3)
#define EXTENDED_SAR 255 #define EXTENDED_SAR 255
#define MB_TYPE_REF0 MB_TYPE_ACPRED //dirty but it fits in 16 bit #define MB_TYPE_REF0 MB_TYPE_ACPRED // dirty but it fits in 16 bit
#define MB_TYPE_8x8DCT 0x01000000 #define MB_TYPE_8x8DCT 0x01000000
#define IS_REF0(a) ((a) & MB_TYPE_REF0) #define IS_REF0(a) ((a) & MB_TYPE_REF0)
#define IS_8x8DCT(a) ((a) & MB_TYPE_8x8DCT) #define IS_8x8DCT(a) ((a) & MB_TYPE_8x8DCT)
...@@ -101,11 +101,11 @@ ...@@ -101,11 +101,11 @@
*/ */
#define DELAYED_PIC_REF 4 #define DELAYED_PIC_REF 4
#define QP_MAX_NUM (51 + 2*6) // The maximum supported qp #define QP_MAX_NUM (51 + 2 * 6) // The maximum supported qp
/* NAL unit types */ /* NAL unit types */
enum { enum {
NAL_SLICE=1, NAL_SLICE = 1,
NAL_DPA, NAL_DPA,
NAL_DPB, NAL_DPB,
NAL_DPC, NAL_DPC,
...@@ -118,17 +118,17 @@ enum { ...@@ -118,17 +118,17 @@ enum {
NAL_END_STREAM, NAL_END_STREAM,
NAL_FILLER_DATA, NAL_FILLER_DATA,
NAL_SPS_EXT, NAL_SPS_EXT,
NAL_AUXILIARY_SLICE=19 NAL_AUXILIARY_SLICE = 19
}; };
/** /**
* SEI message types * SEI message types
*/ */
typedef enum { typedef enum {
SEI_BUFFERING_PERIOD = 0, ///< buffering period (H.264, D.1.1) SEI_BUFFERING_PERIOD = 0, ///< buffering period (H.264, D.1.1)
SEI_TYPE_PIC_TIMING = 1, ///< picture timing SEI_TYPE_PIC_TIMING = 1, ///< picture timing
SEI_TYPE_USER_DATA_UNREGISTERED = 5, ///< unregistered user data SEI_TYPE_USER_DATA_UNREGISTERED = 5, ///< unregistered user data
SEI_TYPE_RECOVERY_POINT = 6 ///< recovery point (frame # to decoder sync) SEI_TYPE_RECOVERY_POINT = 6 ///< recovery point (frame # to decoder sync)
} SEI_Type; } SEI_Type;
/** /**
...@@ -149,8 +149,7 @@ typedef enum { ...@@ -149,8 +149,7 @@ typedef enum {
/** /**
* Sequence parameter set * Sequence parameter set
*/ */
typedef struct SPS{ typedef struct SPS {
int profile_idc; int profile_idc;
int level_idc; int level_idc;
int chroma_format_idc; int chroma_format_idc;
...@@ -167,9 +166,9 @@ typedef struct SPS{ ...@@ -167,9 +166,9 @@ typedef struct SPS{
int mb_width; ///< pic_width_in_mbs_minus1 + 1 int mb_width; ///< pic_width_in_mbs_minus1 + 1
int mb_height; ///< pic_height_in_map_units_minus1 + 1 int mb_height; ///< pic_height_in_map_units_minus1 + 1
int frame_mbs_only_flag; int frame_mbs_only_flag;
int mb_aff; ///<mb_adaptive_frame_field_flag int mb_aff; ///< mb_adaptive_frame_field_flag
int direct_8x8_inference_flag; int direct_8x8_inference_flag;
int crop; ///< frame_cropping_flag int crop; ///< frame_cropping_flag
unsigned int crop_left; ///< frame_cropping_rect_left_offset unsigned int crop_left; ///< frame_cropping_rect_left_offset
unsigned int crop_right; ///< frame_cropping_rect_right_offset unsigned int crop_right; ///< frame_cropping_rect_right_offset
unsigned int crop_top; ///< frame_cropping_rect_top_offset unsigned int crop_top; ///< frame_cropping_rect_top_offset
...@@ -186,7 +185,7 @@ typedef struct SPS{ ...@@ -186,7 +185,7 @@ typedef struct SPS{
uint32_t num_units_in_tick; uint32_t num_units_in_tick;
uint32_t time_scale; uint32_t time_scale;
int fixed_frame_rate_flag; int fixed_frame_rate_flag;
short offset_for_ref_frame[256]; //FIXME dyn aloc? short offset_for_ref_frame[256]; // FIXME dyn aloc?
int bitstream_restriction_flag; int bitstream_restriction_flag;
int num_reorder_frames; int num_reorder_frames;
int scaling_matrix_present; int scaling_matrix_present;
...@@ -196,20 +195,20 @@ typedef struct SPS{ ...@@ -196,20 +195,20 @@ typedef struct SPS{
int vcl_hrd_parameters_present_flag; int vcl_hrd_parameters_present_flag;
int pic_struct_present_flag; int pic_struct_present_flag;
int time_offset_length; int time_offset_length;
int cpb_cnt; ///< See H.264 E.1.2 int cpb_cnt; ///< See H.264 E.1.2
int initial_cpb_removal_delay_length; ///< initial_cpb_removal_delay_length_minus1 +1 int initial_cpb_removal_delay_length; ///< initial_cpb_removal_delay_length_minus1 + 1
int cpb_removal_delay_length; ///< cpb_removal_delay_length_minus1 + 1 int cpb_removal_delay_length; ///< cpb_removal_delay_length_minus1 + 1
int dpb_output_delay_length; ///< dpb_output_delay_length_minus1 + 1 int dpb_output_delay_length; ///< dpb_output_delay_length_minus1 + 1
int bit_depth_luma; ///< bit_depth_luma_minus8 + 8 int bit_depth_luma; ///< bit_depth_luma_minus8 + 8
int bit_depth_chroma; ///< bit_depth_chroma_minus8 + 8 int bit_depth_chroma; ///< bit_depth_chroma_minus8 + 8
int residual_color_transform_flag; ///< residual_colour_transform_flag int residual_color_transform_flag; ///< residual_colour_transform_flag
int constraint_set_flags; ///< constraint_set[0-3]_flag int constraint_set_flags; ///< constraint_set[0-3]_flag
}SPS; } SPS;
/** /**
* Picture parameter set * Picture parameter set
*/ */
typedef struct PPS{ typedef struct PPS {
unsigned int sps_id; unsigned int sps_id;
int cabac; ///< entropy_coding_mode_flag int cabac; ///< entropy_coding_mode_flag
int pic_order_present; ///< pic_order_present_flag int pic_order_present; ///< pic_order_present_flag
...@@ -222,20 +221,20 @@ typedef struct PPS{ ...@@ -222,20 +221,20 @@ typedef struct PPS{
int init_qs; ///< pic_init_qs_minus26 + 26 int init_qs; ///< pic_init_qs_minus26 + 26
int chroma_qp_index_offset[2]; int chroma_qp_index_offset[2];
int deblocking_filter_parameters_present; ///< deblocking_filter_parameters_present_flag int deblocking_filter_parameters_present; ///< deblocking_filter_parameters_present_flag
int constrained_intra_pred; ///< constrained_intra_pred_flag int constrained_intra_pred; ///< constrained_intra_pred_flag
int redundant_pic_cnt_present; ///< redundant_pic_cnt_present_flag int redundant_pic_cnt_present; ///< redundant_pic_cnt_present_flag
int transform_8x8_mode; ///< transform_8x8_mode_flag int transform_8x8_mode; ///< transform_8x8_mode_flag
uint8_t scaling_matrix4[6][16]; uint8_t scaling_matrix4[6][16];
uint8_t scaling_matrix8[6][64]; uint8_t scaling_matrix8[6][64];
uint8_t chroma_qp_table[2][64]; ///< pre-scaled (with chroma_qp_index_offset) version of qp_table uint8_t chroma_qp_table[2][64]; ///< pre-scaled (with chroma_qp_index_offset) version of qp_table
int chroma_qp_diff; int chroma_qp_diff;
}PPS; } PPS;
/** /**
* Memory management control operation opcode. * Memory management control operation opcode.
*/ */
typedef enum MMCOOpcode{ typedef enum MMCOOpcode {
MMCO_END=0, MMCO_END = 0,
MMCO_SHORT2UNUSED, MMCO_SHORT2UNUSED,
MMCO_LONG2UNUSED, MMCO_LONG2UNUSED,
MMCO_SHORT2LONG, MMCO_SHORT2LONG,
...@@ -247,7 +246,7 @@ typedef enum MMCOOpcode{ ...@@ -247,7 +246,7 @@ typedef enum MMCOOpcode{
/** /**
* Memory management control operation. * Memory management control operation.
*/ */
typedef struct MMCO{ typedef struct MMCO {
MMCOOpcode opcode; MMCOOpcode opcode;
int short_pic_num; ///< pic_num without wrapping (pic_num & max_pic_num) int short_pic_num; ///< pic_num without wrapping (pic_num & max_pic_num)
int long_arg; ///< index, pic_num, or num long refs depending on opcode int long_arg; ///< index, pic_num, or num long refs depending on opcode
...@@ -256,18 +255,18 @@ typedef struct MMCO{ ...@@ -256,18 +255,18 @@ typedef struct MMCO{
/** /**
* H264Context * H264Context
*/ */
typedef struct H264Context{ typedef struct H264Context {
MpegEncContext s; MpegEncContext s;
H264DSPContext h264dsp; H264DSPContext h264dsp;
int pixel_shift; ///< 0 for 8-bit H264, 1 for high-bit-depth H264 int pixel_shift; ///< 0 for 8-bit H264, 1 for high-bit-depth H264
int chroma_qp[2]; //QPc int chroma_qp[2]; // QPc
int qp_thresh; ///< QP threshold to skip loopfilter int qp_thresh; ///< QP threshold to skip loopfilter
int prev_mb_skipped; int prev_mb_skipped;
int next_mb_skipped; int next_mb_skipped;
//prediction stuff // prediction stuff
int chroma_pred_mode; int chroma_pred_mode;
int intra16x16_pred_mode; int intra16x16_pred_mode;
...@@ -281,32 +280,32 @@ typedef struct H264Context{ ...@@ -281,32 +280,32 @@ typedef struct H264Context{
int topright_type; int topright_type;
int left_type[LEFT_MBS]; int left_type[LEFT_MBS];
const uint8_t * left_block; const uint8_t *left_block;
int topleft_partition; int topleft_partition;
int8_t intra4x4_pred_mode_cache[5*8]; int8_t intra4x4_pred_mode_cache[5 * 8];
int8_t (*intra4x4_pred_mode); int8_t(*intra4x4_pred_mode);
H264PredContext hpc; H264PredContext hpc;
unsigned int topleft_samples_available; unsigned int topleft_samples_available;
unsigned int top_samples_available; unsigned int top_samples_available;
unsigned int topright_samples_available; unsigned int topright_samples_available;
unsigned int left_samples_available; unsigned int left_samples_available;
uint8_t (*top_borders[2])[(16*3)*2]; uint8_t (*top_borders[2])[(16 * 3) * 2];
/** /**
* non zero coeff count cache. * non zero coeff count cache.
* is 64 if not available. * is 64 if not available.
*/ */
DECLARE_ALIGNED(8, uint8_t, non_zero_count_cache)[15*8]; DECLARE_ALIGNED(8, uint8_t, non_zero_count_cache)[15 * 8];
uint8_t (*non_zero_count)[48]; uint8_t (*non_zero_count)[48];
/** /**
* Motion vector cache. * Motion vector cache.
*/ */
DECLARE_ALIGNED(16, int16_t, mv_cache)[2][5*8][2]; DECLARE_ALIGNED(16, int16_t, mv_cache)[2][5 * 8][2];
DECLARE_ALIGNED(8, int8_t, ref_cache)[2][5*8]; DECLARE_ALIGNED(8, int8_t, ref_cache)[2][5 * 8];
#define LIST_NOT_USED -1 //FIXME rename? #define LIST_NOT_USED -1 // FIXME rename?
#define PART_NOT_AVAILABLE -2 #define PART_NOT_AVAILABLE -2
/** /**
...@@ -318,13 +317,13 @@ typedef struct H264Context{ ...@@ -318,13 +317,13 @@ typedef struct H264Context{
* block_offset[ 0..23] for frame macroblocks * block_offset[ 0..23] for frame macroblocks
* block_offset[24..47] for field macroblocks * block_offset[24..47] for field macroblocks
*/ */
int block_offset[2*(16*3)]; int block_offset[2 * (16 * 3)];
uint32_t *mb2b_xy; //FIXME are these 4 a good idea? uint32_t *mb2b_xy; // FIXME are these 4 a good idea?
uint32_t *mb2br_xy; uint32_t *mb2br_xy;
int b_stride; //FIXME use s->b4_stride int b_stride; // FIXME use s->b4_stride
int mb_linesize; ///< may be equal to s->linesize or s->linesize*2, for mbaff int mb_linesize; ///< may be equal to s->linesize or s->linesize * 2, for mbaff
int mb_uvlinesize; int mb_uvlinesize;
int emu_edge_width; int emu_edge_width;
...@@ -335,32 +334,32 @@ typedef struct H264Context{ ...@@ -335,32 +334,32 @@ typedef struct H264Context{
/** /**
* current pps * current pps
*/ */
PPS pps; //FIXME move to Picture perhaps? (->no) do we need that? PPS pps; // FIXME move to Picture perhaps? (->no) do we need that?
uint32_t dequant4_buffer[6][QP_MAX_NUM+1][16]; //FIXME should these be moved down? uint32_t dequant4_buffer[6][QP_MAX_NUM + 1][16]; // FIXME should these be moved down?
uint32_t dequant8_buffer[6][QP_MAX_NUM+1][64]; uint32_t dequant8_buffer[6][QP_MAX_NUM + 1][64];
uint32_t (*dequant4_coeff[6])[16]; uint32_t(*dequant4_coeff[6])[16];
uint32_t (*dequant8_coeff[6])[64]; uint32_t(*dequant8_coeff[6])[64];
int slice_num; int slice_num;
uint16_t *slice_table; ///< slice_table_base + 2*mb_stride + 1 uint16_t *slice_table; ///< slice_table_base + 2*mb_stride + 1
int slice_type; int slice_type;
int slice_type_nos; ///< S free slice type (SI/SP are remapped to I/P) int slice_type_nos; ///< S free slice type (SI/SP are remapped to I/P)
int slice_type_fixed; int slice_type_fixed;
//interlacing specific flags // interlacing specific flags
int mb_aff_frame; int mb_aff_frame;
int mb_field_decoding_flag; int mb_field_decoding_flag;
int mb_mbaff; ///< mb_aff_frame && mb_field_decoding_flag int mb_mbaff; ///< mb_aff_frame && mb_field_decoding_flag
DECLARE_ALIGNED(8, uint16_t, sub_mb_type)[4]; DECLARE_ALIGNED(8, uint16_t, sub_mb_type)[4];
//Weighted pred stuff // Weighted pred stuff
int use_weight; int use_weight;
int use_weight_chroma; int use_weight_chroma;
int luma_log2_weight_denom; int luma_log2_weight_denom;
int chroma_log2_weight_denom; int chroma_log2_weight_denom;
//The following 2 can be changed to int8_t but that causes 10cpu cycles speedloss // The following 2 can be changed to int8_t but that causes 10cpu cycles speedloss
int luma_weight[48][2][2]; int luma_weight[48][2][2];
int chroma_weight[48][2][2][2]; int chroma_weight[48][2][2][2];
int implicit_weight[48][48][2]; int implicit_weight[48][48][2];
...@@ -370,48 +369,48 @@ typedef struct H264Context{ ...@@ -370,48 +369,48 @@ typedef struct H264Context{
int col_fieldoff; int col_fieldoff;
int dist_scale_factor[16]; int dist_scale_factor[16];
int dist_scale_factor_field[2][32]; int dist_scale_factor_field[2][32];
int map_col_to_list0[2][16+32]; int map_col_to_list0[2][16 + 32];
int map_col_to_list0_field[2][2][16+32]; int map_col_to_list0_field[2][2][16 + 32];
/** /**
* num_ref_idx_l0/1_active_minus1 + 1 * num_ref_idx_l0/1_active_minus1 + 1
*/ */
unsigned int ref_count[2]; ///< counts frames or fields, depending on current mb mode unsigned int ref_count[2]; ///< counts frames or fields, depending on current mb mode
unsigned int list_count; unsigned int list_count;
uint8_t *list_counts; ///< Array of list_count per MB specifying the slice type uint8_t *list_counts; ///< Array of list_count per MB specifying the slice type
Picture ref_list[2][48]; /**< 0..15: frame refs, 16..47: mbaff field refs. Picture ref_list[2][48]; /**< 0..15: frame refs, 16..47: mbaff field refs.
Reordered version of default_ref_list * Reordered version of default_ref_list
according to picture reordering in slice header */ * according to picture reordering in slice header */
int ref2frm[MAX_SLICES][2][64]; ///< reference to frame number lists, used in the loop filter, the first 2 are for -2,-1 int ref2frm[MAX_SLICES][2][64]; ///< reference to frame number lists, used in the loop filter, the first 2 are for -2,-1
//data partitioning // data partitioning
GetBitContext intra_gb; GetBitContext intra_gb;
GetBitContext inter_gb; GetBitContext inter_gb;
GetBitContext *intra_gb_ptr; GetBitContext *intra_gb_ptr;
GetBitContext *inter_gb_ptr; GetBitContext *inter_gb_ptr;
DECLARE_ALIGNED(16, DCTELEM, mb)[16*48*2]; ///< as a dct coeffecient is int32_t in high depth, we need to reserve twice the space. DECLARE_ALIGNED(16, DCTELEM, mb)[16 * 48 * 2]; ///< as a dct coeffecient is int32_t in high depth, we need to reserve twice the space.
DECLARE_ALIGNED(16, DCTELEM, mb_luma_dc)[3][16*2]; DECLARE_ALIGNED(16, DCTELEM, mb_luma_dc)[3][16 * 2];
DCTELEM mb_padding[256*2]; ///< as mb is addressed by scantable[i] and scantable is uint8_t we can either check that i is not too large or ensure that there is some unused stuff after mb DCTELEM mb_padding[256 * 2]; ///< as mb is addressed by scantable[i] and scantable is uint8_t we can either check that i is not too large or ensure that there is some unused stuff after mb
/** /**
* Cabac * Cabac
*/ */
CABACContext cabac; CABACContext cabac;
uint8_t cabac_state[1024]; uint8_t cabac_state[1024];
/* 0x100 -> non null luma_dc, 0x80/0x40 -> non null chroma_dc (cb/cr), 0x?0 -> chroma_cbp(0,1,2), 0x0? luma_cbp */ /* 0x100 -> non null luma_dc, 0x80/0x40 -> non null chroma_dc (cb/cr), 0x?0 -> chroma_cbp(0, 1, 2), 0x0? luma_cbp */
uint16_t *cbp_table; uint16_t *cbp_table;
int cbp; int cbp;
int top_cbp; int top_cbp;
int left_cbp; int left_cbp;
/* chroma_pred_mode for i4x4 or i16x16, else 0 */ /* chroma_pred_mode for i4x4 or i16x16, else 0 */
uint8_t *chroma_pred_mode_table; uint8_t *chroma_pred_mode_table;
int last_qscale_diff; int last_qscale_diff;
uint8_t (*mvd_table[2])[2]; uint8_t (*mvd_table[2])[2];
DECLARE_ALIGNED(16, uint8_t, mvd_cache)[2][5*8][2]; DECLARE_ALIGNED(16, uint8_t, mvd_cache)[2][5 * 8][2];
uint8_t *direct_table; uint8_t *direct_table;
uint8_t direct_cache[5*8]; uint8_t direct_cache[5 * 8];
uint8_t zigzag_scan[16]; uint8_t zigzag_scan[16];
uint8_t zigzag_scan8x8[64]; uint8_t zigzag_scan8x8[64];
...@@ -432,13 +431,13 @@ typedef struct H264Context{ ...@@ -432,13 +431,13 @@ typedef struct H264Context{
int is_complex; int is_complex;
//deblock // deblock
int deblocking_filter; ///< disable_deblocking_filter_idc with 1<->0 int deblocking_filter; ///< disable_deblocking_filter_idc with 1 <-> 0
int slice_alpha_c0_offset; int slice_alpha_c0_offset;
int slice_beta_offset; int slice_beta_offset;
//============================================================= // =============================================================
//Things below are not used in the MB or more inner code // Things below are not used in the MB or more inner code
int nal_ref_idc; int nal_ref_idc;
int nal_unit_type; int nal_unit_type;
...@@ -448,37 +447,36 @@ typedef struct H264Context{ ...@@ -448,37 +447,36 @@ typedef struct H264Context{
/** /**
* Used to parse AVC variant of h264 * Used to parse AVC variant of h264
*/ */
int is_avc; ///< this flag is != 0 if codec is avc1 int is_avc; ///< this flag is != 0 if codec is avc1
int nal_length_size; ///< Number of bytes used for nal length (1, 2 or 4) int nal_length_size; ///< Number of bytes used for nal length (1, 2 or 4)
int got_first; ///< this flag is != 0 if we've parsed a frame int got_first; ///< this flag is != 0 if we've parsed a frame
SPS *sps_buffers[MAX_SPS_COUNT]; SPS *sps_buffers[MAX_SPS_COUNT];
PPS *pps_buffers[MAX_PPS_COUNT]; PPS *pps_buffers[MAX_PPS_COUNT];
int dequant_coeff_pps; ///< reinit tables when pps changes int dequant_coeff_pps; ///< reinit tables when pps changes
uint16_t *slice_table_base; uint16_t *slice_table_base;
// POC stuff
//POC stuff
int poc_lsb; int poc_lsb;
int poc_msb; int poc_msb;
int delta_poc_bottom; int delta_poc_bottom;
int delta_poc[2]; int delta_poc[2];
int frame_num; int frame_num;
int prev_poc_msb; ///< poc_msb of the last reference pic for POC type 0 int prev_poc_msb; ///< poc_msb of the last reference pic for POC type 0
int prev_poc_lsb; ///< poc_lsb of the last reference pic for POC type 0 int prev_poc_lsb; ///< poc_lsb of the last reference pic for POC type 0
int frame_num_offset; ///< for POC type 2 int frame_num_offset; ///< for POC type 2
int prev_frame_num_offset; ///< for POC type 2 int prev_frame_num_offset; ///< for POC type 2
int prev_frame_num; ///< frame_num of the last pic for POC type 1/2 int prev_frame_num; ///< frame_num of the last pic for POC type 1/2
/** /**
* frame_num for frames or 2*frame_num+1 for field pics. * frame_num for frames or 2 * frame_num + 1 for field pics.
*/ */
int curr_pic_num; int curr_pic_num;
/** /**
* max_frame_num or 2*max_frame_num for field pics. * max_frame_num or 2 * max_frame_num for field pics.
*/ */
int max_pic_num; int max_pic_num;
...@@ -487,7 +485,7 @@ typedef struct H264Context{ ...@@ -487,7 +485,7 @@ typedef struct H264Context{
Picture *short_ref[32]; Picture *short_ref[32];
Picture *long_ref[32]; Picture *long_ref[32];
Picture default_ref_list[2][32]; ///< base reference list for all slices of a coded picture Picture default_ref_list[2][32]; ///< base reference list for all slices of a coded picture
Picture *delayed_pic[MAX_DELAYED_PIC_COUNT+2]; //FIXME size? Picture *delayed_pic[MAX_DELAYED_PIC_COUNT + 2]; // FIXME size?
int last_pocs[MAX_DELAYED_PIC_COUNT]; int last_pocs[MAX_DELAYED_PIC_COUNT];
Picture *next_output_pic; Picture *next_output_pic;
int outputed_poc; int outputed_poc;
...@@ -500,10 +498,10 @@ typedef struct H264Context{ ...@@ -500,10 +498,10 @@ typedef struct H264Context{
int mmco_index; int mmco_index;
int mmco_reset; int mmco_reset;
int long_ref_count; ///< number of actual long term references int long_ref_count; ///< number of actual long term references
int short_ref_count; ///< number of actual short term references int short_ref_count; ///< number of actual short term references
int cabac_init_idc; int cabac_init_idc;
/** /**
* @name Members for slice based multithreading * @name Members for slice based multithreading
...@@ -572,18 +570,17 @@ typedef struct H264Context{ ...@@ -572,18 +570,17 @@ typedef struct H264Context{
*/ */
int sei_recovery_frame_cnt; int sei_recovery_frame_cnt;
int luma_weight_flag[2]; ///< 7.4.3.2 luma_weight_lX_flag int luma_weight_flag[2]; ///< 7.4.3.2 luma_weight_lX_flag
int chroma_weight_flag[2]; ///< 7.4.3.2 chroma_weight_lX_flag int chroma_weight_flag[2]; ///< 7.4.3.2 chroma_weight_lX_flag
// Timestamp stuff // Timestamp stuff
int sei_buffering_period_present; ///< Buffering period SEI flag int sei_buffering_period_present; ///< Buffering period SEI flag
int initial_cpb_removal_delay[32]; ///< Initial timestamps for CPBs int initial_cpb_removal_delay[32]; ///< Initial timestamps for CPBs
int cur_chroma_format_idc; int cur_chroma_format_idc;
}H264Context; } H264Context;
extern const uint8_t ff_h264_chroma_qp[3][QP_MAX_NUM + 1]; ///< One chroma qp table for each supported bit depth (8, 9, 10).
extern const uint8_t ff_h264_chroma_qp[3][QP_MAX_NUM+1]; ///< One chroma qp table for each supported bit depth (8, 9, 10).
extern const uint16_t ff_h264_mb_sizes[4]; extern const uint16_t ff_h264_mb_sizes[4];
/** /**
...@@ -610,13 +607,16 @@ int ff_h264_decode_picture_parameter_set(H264Context *h, int bit_length); ...@@ -610,13 +607,16 @@ int ff_h264_decode_picture_parameter_set(H264Context *h, int bit_length);
* Decode a network abstraction layer unit. * Decode a network abstraction layer unit.
* @param consumed is the number of bytes used as input * @param consumed is the number of bytes used as input
* @param length is the length of the array * @param length is the length of the array
* @param dst_length is the number of decoded bytes FIXME here or a decode rbsp tailing? * @param dst_length is the number of decoded bytes FIXME here
* or a decode rbsp tailing?
* @return decoded bytes, might be src+1 if no escapes * @return decoded bytes, might be src+1 if no escapes
*/ */
const uint8_t *ff_h264_decode_nal(H264Context *h, const uint8_t *src, int *dst_length, int *consumed, int length); const uint8_t *ff_h264_decode_nal(H264Context *h, const uint8_t *src,
int *dst_length, int *consumed, int length);
/** /**
* Free any data that may have been allocated in the H264 context like SPS, PPS etc. * Free any data that may have been allocated in the H264 context
* like SPS, PPS etc.
*/ */
av_cold void ff_h264_free_context(H264Context *h); av_cold void ff_h264_free_context(H264Context *h);
...@@ -649,14 +649,15 @@ int ff_h264_decode_ref_pic_marking(H264Context *h, GetBitContext *gb); ...@@ -649,14 +649,15 @@ int ff_h264_decode_ref_pic_marking(H264Context *h, GetBitContext *gb);
void ff_generate_sliding_window_mmcos(H264Context *h); void ff_generate_sliding_window_mmcos(H264Context *h);
/** /**
* Check if the top & left blocks are available if needed & change the dc mode so it only uses the available blocks. * Check if the top & left blocks are available if needed & change the
* dc mode so it only uses the available blocks.
*/ */
int ff_h264_check_intra4x4_pred_mode(H264Context *h); int ff_h264_check_intra4x4_pred_mode(H264Context *h);
/** /**
* Check if the top & left blocks are available if needed & change the dc mode so it only uses the available blocks. * Check if the top & left blocks are available if needed & change the
* dc mode so it only uses the available blocks.
*/ */
int ff_h264_check_intra_pred_mode(H264Context *h, int mode, int is_chroma); int ff_h264_check_intra_pred_mode(H264Context *h, int mode, int is_chroma);
...@@ -668,24 +669,28 @@ av_cold void ff_h264_decode_init_vlc(void); ...@@ -668,24 +669,28 @@ av_cold void ff_h264_decode_init_vlc(void);
/** /**
* Decode a macroblock * Decode a macroblock
* @return 0 if OK, ER_AC_ERROR / ER_DC_ERROR / ER_MV_ERROR if an error is noticed * @return 0 if OK, ER_AC_ERROR / ER_DC_ERROR / ER_MV_ERROR on error
*/ */
int ff_h264_decode_mb_cavlc(H264Context *h); int ff_h264_decode_mb_cavlc(H264Context *h);
/** /**
* Decode a CABAC coded macroblock * Decode a CABAC coded macroblock
* @return 0 if OK, ER_AC_ERROR / ER_DC_ERROR / ER_MV_ERROR if an error is noticed * @return 0 if OK, ER_AC_ERROR / ER_DC_ERROR / ER_MV_ERROR on error
*/ */
int ff_h264_decode_mb_cabac(H264Context *h); int ff_h264_decode_mb_cabac(H264Context *h);
void ff_h264_init_cabac_states(H264Context *h); void ff_h264_init_cabac_states(H264Context *h);
void ff_h264_direct_dist_scale_factor(H264Context * const h); void ff_h264_direct_dist_scale_factor(H264Context *const h);
void ff_h264_direct_ref_list_init(H264Context * const h); void ff_h264_direct_ref_list_init(H264Context *const h);
void ff_h264_pred_direct_motion(H264Context * const h, int *mb_type); void ff_h264_pred_direct_motion(H264Context *const h, int *mb_type);
void ff_h264_filter_mb_fast( H264Context *h, int mb_x, int mb_y, uint8_t *img_y, uint8_t *img_cb, uint8_t *img_cr, unsigned int linesize, unsigned int uvlinesize); void ff_h264_filter_mb_fast(H264Context *h, int mb_x, int mb_y,
void ff_h264_filter_mb( H264Context *h, int mb_x, int mb_y, uint8_t *img_y, uint8_t *img_cb, uint8_t *img_cr, unsigned int linesize, unsigned int uvlinesize); uint8_t *img_y, uint8_t *img_cb, uint8_t *img_cr,
unsigned int linesize, unsigned int uvlinesize);
void ff_h264_filter_mb(H264Context *h, int mb_x, int mb_y,
uint8_t *img_y, uint8_t *img_cb, uint8_t *img_cr,
unsigned int linesize, unsigned int uvlinesize);
/** /**
* Reset SEI values at the beginning of the frame. * Reset SEI values at the beginning of the frame.
...@@ -694,16 +699,15 @@ void ff_h264_filter_mb( H264Context *h, int mb_x, int mb_y, uint8_t *img_y, uint ...@@ -694,16 +699,15 @@ void ff_h264_filter_mb( H264Context *h, int mb_x, int mb_y, uint8_t *img_y, uint
*/ */
void ff_h264_reset_sei(H264Context *h); void ff_h264_reset_sei(H264Context *h);
/* /*
o-o o-o * o-o o-o
/ / / * / / /
o-o o-o * o-o o-o
,---' * ,---'
o-o o-o * o-o o-o
/ / / * / / /
o-o o-o * o-o o-o
*/ */
/* Scan8 organization: /* Scan8 organization:
* 0 1 2 3 4 5 6 7 * 0 1 2 3 4 5 6 7
...@@ -728,156 +732,173 @@ o-o o-o ...@@ -728,156 +732,173 @@ o-o o-o
#define LUMA_DC_BLOCK_INDEX 48 #define LUMA_DC_BLOCK_INDEX 48
#define CHROMA_DC_BLOCK_INDEX 49 #define CHROMA_DC_BLOCK_INDEX 49
//This table must be here because scan8[constant] must be known at compiletime // This table must be here because scan8[constant] must be known at compiletime
static const uint8_t scan8[16*3 + 3]={ static const uint8_t scan8[16 * 3 + 3] = {
4+ 1*8, 5+ 1*8, 4+ 2*8, 5+ 2*8, 4 + 1 * 8, 5 + 1 * 8, 4 + 2 * 8, 5 + 2 * 8,
6+ 1*8, 7+ 1*8, 6+ 2*8, 7+ 2*8, 6 + 1 * 8, 7 + 1 * 8, 6 + 2 * 8, 7 + 2 * 8,
4+ 3*8, 5+ 3*8, 4+ 4*8, 5+ 4*8, 4 + 3 * 8, 5 + 3 * 8, 4 + 4 * 8, 5 + 4 * 8,
6+ 3*8, 7+ 3*8, 6+ 4*8, 7+ 4*8, 6 + 3 * 8, 7 + 3 * 8, 6 + 4 * 8, 7 + 4 * 8,
4+ 6*8, 5+ 6*8, 4+ 7*8, 5+ 7*8, 4 + 6 * 8, 5 + 6 * 8, 4 + 7 * 8, 5 + 7 * 8,
6+ 6*8, 7+ 6*8, 6+ 7*8, 7+ 7*8, 6 + 6 * 8, 7 + 6 * 8, 6 + 7 * 8, 7 + 7 * 8,
4+ 8*8, 5+ 8*8, 4+ 9*8, 5+ 9*8, 4 + 8 * 8, 5 + 8 * 8, 4 + 9 * 8, 5 + 9 * 8,
6+ 8*8, 7+ 8*8, 6+ 9*8, 7+ 9*8, 6 + 8 * 8, 7 + 8 * 8, 6 + 9 * 8, 7 + 9 * 8,
4+11*8, 5+11*8, 4+12*8, 5+12*8, 4 + 11 * 8, 5 + 11 * 8, 4 + 12 * 8, 5 + 12 * 8,
6+11*8, 7+11*8, 6+12*8, 7+12*8, 6 + 11 * 8, 7 + 11 * 8, 6 + 12 * 8, 7 + 12 * 8,
4+13*8, 5+13*8, 4+14*8, 5+14*8, 4 + 13 * 8, 5 + 13 * 8, 4 + 14 * 8, 5 + 14 * 8,
6+13*8, 7+13*8, 6+14*8, 7+14*8, 6 + 13 * 8, 7 + 13 * 8, 6 + 14 * 8, 7 + 14 * 8,
0+ 0*8, 0+ 5*8, 0+10*8 0 + 0 * 8, 0 + 5 * 8, 0 + 10 * 8
}; };
static av_always_inline uint32_t pack16to32(int a, int b){ static av_always_inline uint32_t pack16to32(int a, int b)
{
#if HAVE_BIGENDIAN #if HAVE_BIGENDIAN
return (b&0xFFFF) + (a<<16); return (b & 0xFFFF) + (a << 16);
#else #else
return (a&0xFFFF) + (b<<16); return (a & 0xFFFF) + (b << 16);
#endif #endif
} }
static av_always_inline uint16_t pack8to16(int a, int b){ static av_always_inline uint16_t pack8to16(int a, int b)
{
#if HAVE_BIGENDIAN #if HAVE_BIGENDIAN
return (b&0xFF) + (a<<8); return (b & 0xFF) + (a << 8);
#else #else
return (a&0xFF) + (b<<8); return (a & 0xFF) + (b << 8);
#endif #endif
} }
/** /**
* Get the chroma qp. * Get the chroma qp.
*/ */
static av_always_inline int get_chroma_qp(H264Context *h, int t, int qscale){ static av_always_inline int get_chroma_qp(H264Context *h, int t, int qscale)
{
return h->pps.chroma_qp_table[t][qscale]; return h->pps.chroma_qp_table[t][qscale];
} }
/** /**
* Get the predicted intra4x4 prediction mode. * Get the predicted intra4x4 prediction mode.
*/ */
static av_always_inline int pred_intra_mode(H264Context *h, int n){ static av_always_inline int pred_intra_mode(H264Context *h, int n)
const int index8= scan8[n]; {
const int left= h->intra4x4_pred_mode_cache[index8 - 1]; const int index8 = scan8[n];
const int top = h->intra4x4_pred_mode_cache[index8 - 8]; const int left = h->intra4x4_pred_mode_cache[index8 - 1];
const int min= FFMIN(left, top); const int top = h->intra4x4_pred_mode_cache[index8 - 8];
const int min = FFMIN(left, top);
tprintf(h->s.avctx, "mode:%d %d min:%d\n", left ,top, min); tprintf(h->s.avctx, "mode:%d %d min:%d\n", left, top, min);
if(min<0) return DC_PRED; if (min < 0)
else return min; return DC_PRED;
else
return min;
} }
static av_always_inline void write_back_intra_pred_mode(H264Context *h){ static av_always_inline void write_back_intra_pred_mode(H264Context *h)
int8_t *i4x4= h->intra4x4_pred_mode + h->mb2br_xy[h->mb_xy]; {
int8_t *i4x4_cache= h->intra4x4_pred_mode_cache; int8_t *i4x4 = h->intra4x4_pred_mode + h->mb2br_xy[h->mb_xy];
int8_t *i4x4_cache = h->intra4x4_pred_mode_cache;
AV_COPY32(i4x4, i4x4_cache + 4 + 8*4); AV_COPY32(i4x4, i4x4_cache + 4 + 8 * 4);
i4x4[4]= i4x4_cache[7+8*3]; i4x4[4] = i4x4_cache[7 + 8 * 3];
i4x4[5]= i4x4_cache[7+8*2]; i4x4[5] = i4x4_cache[7 + 8 * 2];
i4x4[6]= i4x4_cache[7+8*1]; i4x4[6] = i4x4_cache[7 + 8 * 1];
} }
static av_always_inline void write_back_non_zero_count(H264Context *h){ static av_always_inline void write_back_non_zero_count(H264Context *h)
const int mb_xy= h->mb_xy; {
uint8_t *nnz = h->non_zero_count[mb_xy]; const int mb_xy = h->mb_xy;
uint8_t *nnz = h->non_zero_count[mb_xy];
uint8_t *nnz_cache = h->non_zero_count_cache; uint8_t *nnz_cache = h->non_zero_count_cache;
AV_COPY32(&nnz[ 0], &nnz_cache[4+8* 1]); AV_COPY32(&nnz[ 0], &nnz_cache[4 + 8 * 1]);
AV_COPY32(&nnz[ 4], &nnz_cache[4+8* 2]); AV_COPY32(&nnz[ 4], &nnz_cache[4 + 8 * 2]);
AV_COPY32(&nnz[ 8], &nnz_cache[4+8* 3]); AV_COPY32(&nnz[ 8], &nnz_cache[4 + 8 * 3]);
AV_COPY32(&nnz[12], &nnz_cache[4+8* 4]); AV_COPY32(&nnz[12], &nnz_cache[4 + 8 * 4]);
AV_COPY32(&nnz[16], &nnz_cache[4+8* 6]); AV_COPY32(&nnz[16], &nnz_cache[4 + 8 * 6]);
AV_COPY32(&nnz[20], &nnz_cache[4+8* 7]); AV_COPY32(&nnz[20], &nnz_cache[4 + 8 * 7]);
AV_COPY32(&nnz[32], &nnz_cache[4+8*11]); AV_COPY32(&nnz[32], &nnz_cache[4 + 8 * 11]);
AV_COPY32(&nnz[36], &nnz_cache[4+8*12]); AV_COPY32(&nnz[36], &nnz_cache[4 + 8 * 12]);
if(!h->s.chroma_y_shift){ if (!h->s.chroma_y_shift) {
AV_COPY32(&nnz[24], &nnz_cache[4+8* 8]); AV_COPY32(&nnz[24], &nnz_cache[4 + 8 * 8]);
AV_COPY32(&nnz[28], &nnz_cache[4+8* 9]); AV_COPY32(&nnz[28], &nnz_cache[4 + 8 * 9]);
AV_COPY32(&nnz[40], &nnz_cache[4+8*13]); AV_COPY32(&nnz[40], &nnz_cache[4 + 8 * 13]);
AV_COPY32(&nnz[44], &nnz_cache[4+8*14]); AV_COPY32(&nnz[44], &nnz_cache[4 + 8 * 14]);
} }
} }
static av_always_inline void write_back_motion_list(H264Context *h, MpegEncContext * const s, int b_stride, static av_always_inline void write_back_motion_list(H264Context *h,
int b_xy, int b8_xy, int mb_type, int list ) MpegEncContext *const s,
int b_stride,
int b_xy, int b8_xy,
int mb_type, int list)
{ {
int16_t (*mv_dst)[2] = &s->current_picture.f.motion_val[list][b_xy]; int16_t(*mv_dst)[2] = &s->current_picture.f.motion_val[list][b_xy];
int16_t (*mv_src)[2] = &h->mv_cache[list][scan8[0]]; int16_t(*mv_src)[2] = &h->mv_cache[list][scan8[0]];
AV_COPY128(mv_dst + 0*b_stride, mv_src + 8*0); AV_COPY128(mv_dst + 0 * b_stride, mv_src + 8 * 0);
AV_COPY128(mv_dst + 1*b_stride, mv_src + 8*1); AV_COPY128(mv_dst + 1 * b_stride, mv_src + 8 * 1);
AV_COPY128(mv_dst + 2*b_stride, mv_src + 8*2); AV_COPY128(mv_dst + 2 * b_stride, mv_src + 8 * 2);
AV_COPY128(mv_dst + 3*b_stride, mv_src + 8*3); AV_COPY128(mv_dst + 3 * b_stride, mv_src + 8 * 3);
if( CABAC ) { if (CABAC) {
uint8_t (*mvd_dst)[2] = &h->mvd_table[list][FMO ? 8*h->mb_xy : h->mb2br_xy[h->mb_xy]]; uint8_t (*mvd_dst)[2] = &h->mvd_table[list][FMO ? 8 * h->mb_xy
uint8_t (*mvd_src)[2] = &h->mvd_cache[list][scan8[0]]; : h->mb2br_xy[h->mb_xy]];
if(IS_SKIP(mb_type)) uint8_t(*mvd_src)[2] = &h->mvd_cache[list][scan8[0]];
if (IS_SKIP(mb_type)) {
AV_ZERO128(mvd_dst); AV_ZERO128(mvd_dst);
else{ } else {
AV_COPY64(mvd_dst, mvd_src + 8*3); AV_COPY64(mvd_dst, mvd_src + 8 * 3);
AV_COPY16(mvd_dst + 3 + 3, mvd_src + 3 + 8*0); AV_COPY16(mvd_dst + 3 + 3, mvd_src + 3 + 8 * 0);
AV_COPY16(mvd_dst + 3 + 2, mvd_src + 3 + 8*1); AV_COPY16(mvd_dst + 3 + 2, mvd_src + 3 + 8 * 1);
AV_COPY16(mvd_dst + 3 + 1, mvd_src + 3 + 8*2); AV_COPY16(mvd_dst + 3 + 1, mvd_src + 3 + 8 * 2);
} }
} }
{ {
int8_t *ref_index = &s->current_picture.f.ref_index[list][b8_xy]; int8_t *ref_index = &s->current_picture.f.ref_index[list][b8_xy];
int8_t *ref_cache = h->ref_cache[list]; int8_t *ref_cache = h->ref_cache[list];
ref_index[0+0*2]= ref_cache[scan8[0]]; ref_index[0 + 0 * 2] = ref_cache[scan8[0]];
ref_index[1+0*2]= ref_cache[scan8[4]]; ref_index[1 + 0 * 2] = ref_cache[scan8[4]];
ref_index[0+1*2]= ref_cache[scan8[8]]; ref_index[0 + 1 * 2] = ref_cache[scan8[8]];
ref_index[1+1*2]= ref_cache[scan8[12]]; ref_index[1 + 1 * 2] = ref_cache[scan8[12]];
} }
} }
static av_always_inline void write_back_motion(H264Context *h, int mb_type){ static av_always_inline void write_back_motion(H264Context *h, int mb_type)
MpegEncContext * const s = &h->s; {
const int b_stride = h->b_stride; MpegEncContext *const s = &h->s;
const int b_xy = 4*s->mb_x + 4*s->mb_y*h->b_stride; //try mb2b(8)_xy const int b_stride = h->b_stride;
const int b8_xy= 4*h->mb_xy; const int b_xy = 4 * s->mb_x + 4 * s->mb_y * h->b_stride; // try mb2b(8)_xy
const int b8_xy = 4 * h->mb_xy;
if(USES_LIST(mb_type, 0)){ if (USES_LIST(mb_type, 0)) {
write_back_motion_list(h, s, b_stride, b_xy, b8_xy, mb_type, 0); write_back_motion_list(h, s, b_stride, b_xy, b8_xy, mb_type, 0);
}else{ } else {
fill_rectangle(&s->current_picture.f.ref_index[0][b8_xy], fill_rectangle(&s->current_picture.f.ref_index[0][b8_xy],
2, 2, 2, (uint8_t)LIST_NOT_USED, 1); 2, 2, 2, (uint8_t)LIST_NOT_USED, 1);
} }
if(USES_LIST(mb_type, 1)){ if (USES_LIST(mb_type, 1))
write_back_motion_list(h, s, b_stride, b_xy, b8_xy, mb_type, 1); write_back_motion_list(h, s, b_stride, b_xy, b8_xy, mb_type, 1);
}
if(h->slice_type_nos == AV_PICTURE_TYPE_B && CABAC){ if (h->slice_type_nos == AV_PICTURE_TYPE_B && CABAC) {
if(IS_8X8(mb_type)){ if (IS_8X8(mb_type)) {
uint8_t *direct_table = &h->direct_table[4*h->mb_xy]; uint8_t *direct_table = &h->direct_table[4 * h->mb_xy];
direct_table[1] = h->sub_mb_type[1]>>1; direct_table[1] = h->sub_mb_type[1] >> 1;
direct_table[2] = h->sub_mb_type[2]>>1; direct_table[2] = h->sub_mb_type[2] >> 1;
direct_table[3] = h->sub_mb_type[3]>>1; direct_table[3] = h->sub_mb_type[3] >> 1;
} }
} }
} }
static av_always_inline int get_dct8x8_allowed(H264Context *h){ static av_always_inline int get_dct8x8_allowed(H264Context *h)
if(h->sps.direct_8x8_inference_flag) {
return !(AV_RN64A(h->sub_mb_type) & ((MB_TYPE_16x8|MB_TYPE_8x16|MB_TYPE_8x8 )*0x0001000100010001ULL)); if (h->sps.direct_8x8_inference_flag)
return !(AV_RN64A(h->sub_mb_type) &
((MB_TYPE_16x8 | MB_TYPE_8x16 | MB_TYPE_8x8) *
0x0001000100010001ULL));
else else
return !(AV_RN64A(h->sub_mb_type) & ((MB_TYPE_16x8|MB_TYPE_8x16|MB_TYPE_8x8|MB_TYPE_DIRECT2)*0x0001000100010001ULL)); return !(AV_RN64A(h->sub_mb_type) &
((MB_TYPE_16x8 | MB_TYPE_8x16 | MB_TYPE_8x8 | MB_TYPE_DIRECT2) *
0x0001000100010001ULL));
} }
#endif /* AVCODEC_H264_H */ #endif /* AVCODEC_H264_H */
libavcodec/h264data.h
View file @ be545b8a
...@@ -30,240 +30,243 @@ ...@@ -30,240 +30,243 @@
#define AVCODEC_H264DATA_H #define AVCODEC_H264DATA_H
#include <stdint.h> #include <stdint.h>
#include "libavutil/rational.h" #include "libavutil/rational.h"
#include "mpegvideo.h" #include "mpegvideo.h"
#include "h264.h" #include "h264.h"
static const uint8_t golomb_to_pict_type[5] = {
AV_PICTURE_TYPE_P, AV_PICTURE_TYPE_B, AV_PICTURE_TYPE_I,
AV_PICTURE_TYPE_SP, AV_PICTURE_TYPE_SI
};
static const uint8_t golomb_to_pict_type[5]= static const uint8_t golomb_to_intra4x4_cbp[48] = {
{AV_PICTURE_TYPE_P, AV_PICTURE_TYPE_B, AV_PICTURE_TYPE_I, AV_PICTURE_TYPE_SP, AV_PICTURE_TYPE_SI}; 47, 31, 15, 0, 23, 27, 29, 30, 7, 11, 13, 14, 39, 43, 45, 46,
16, 3, 5, 10, 12, 19, 21, 26, 28, 35, 37, 42, 44, 1, 2, 4,
static const uint8_t golomb_to_intra4x4_cbp[48]={ 8, 17, 18, 20, 24, 6, 9, 22, 25, 32, 33, 34, 36, 40, 38, 41
47, 31, 15, 0, 23, 27, 29, 30, 7, 11, 13, 14, 39, 43, 45, 46,
16, 3, 5, 10, 12, 19, 21, 26, 28, 35, 37, 42, 44, 1, 2, 4,
8, 17, 18, 20, 24, 6, 9, 22, 25, 32, 33, 34, 36, 40, 38, 41
}; };
static const uint8_t golomb_to_inter_cbp[48]={ static const uint8_t golomb_to_inter_cbp[48] = {
0, 16, 1, 2, 4, 8, 32, 3, 5, 10, 12, 15, 47, 7, 11, 13, 0, 16, 1, 2, 4, 8, 32, 3, 5, 10, 12, 15, 47, 7, 11, 13,
14, 6, 9, 31, 35, 37, 42, 44, 33, 34, 36, 40, 39, 43, 45, 46, 14, 6, 9, 31, 35, 37, 42, 44, 33, 34, 36, 40, 39, 43, 45, 46,
17, 18, 20, 24, 19, 21, 26, 28, 23, 27, 29, 30, 22, 25, 38, 41 17, 18, 20, 24, 19, 21, 26, 28, 23, 27, 29, 30, 22, 25, 38, 41
}; };
static const uint8_t zigzag_scan[16]={ static const uint8_t zigzag_scan[16] = {
0+0*4, 1+0*4, 0+1*4, 0+2*4, 0 + 0 * 4, 1 + 0 * 4, 0 + 1 * 4, 0 + 2 * 4,
1+1*4, 2+0*4, 3+0*4, 2+1*4, 1 + 1 * 4, 2 + 0 * 4, 3 + 0 * 4, 2 + 1 * 4,
1+2*4, 0+3*4, 1+3*4, 2+2*4, 1 + 2 * 4, 0 + 3 * 4, 1 + 3 * 4, 2 + 2 * 4,
3+1*4, 3+2*4, 2+3*4, 3+3*4, 3 + 1 * 4, 3 + 2 * 4, 2 + 3 * 4, 3 + 3 * 4,
}; };
static const uint8_t field_scan[16]={ static const uint8_t field_scan[16] = {
0+0*4, 0+1*4, 1+0*4, 0+2*4, 0 + 0 * 4, 0 + 1 * 4, 1 + 0 * 4, 0 + 2 * 4,
0+3*4, 1+1*4, 1+2*4, 1+3*4, 0 + 3 * 4, 1 + 1 * 4, 1 + 2 * 4, 1 + 3 * 4,
2+0*4, 2+1*4, 2+2*4, 2+3*4, 2 + 0 * 4, 2 + 1 * 4, 2 + 2 * 4, 2 + 3 * 4,
3+0*4, 3+1*4, 3+2*4, 3+3*4, 3 + 0 * 4, 3 + 1 * 4, 3 + 2 * 4, 3 + 3 * 4,
}; };
static const uint8_t luma_dc_zigzag_scan[16]={ static const uint8_t luma_dc_zigzag_scan[16] = {
0*16 + 0*64, 1*16 + 0*64, 2*16 + 0*64, 0*16 + 2*64, 0 * 16 + 0 * 64, 1 * 16 + 0 * 64, 2 * 16 + 0 * 64, 0 * 16 + 2 * 64,
3*16 + 0*64, 0*16 + 1*64, 1*16 + 1*64, 2*16 + 1*64, 3 * 16 + 0 * 64, 0 * 16 + 1 * 64, 1 * 16 + 1 * 64, 2 * 16 + 1 * 64,
1*16 + 2*64, 2*16 + 2*64, 3*16 + 2*64, 0*16 + 3*64, 1 * 16 + 2 * 64, 2 * 16 + 2 * 64, 3 * 16 + 2 * 64, 0 * 16 + 3 * 64,
3*16 + 1*64, 1*16 + 3*64, 2*16 + 3*64, 3*16 + 3*64, 3 * 16 + 1 * 64, 1 * 16 + 3 * 64, 2 * 16 + 3 * 64, 3 * 16 + 3 * 64,
}; };
static const uint8_t luma_dc_field_scan[16]={ static const uint8_t luma_dc_field_scan[16] = {
0*16 + 0*64, 2*16 + 0*64, 1*16 + 0*64, 0*16 + 2*64, 0 * 16 + 0 * 64, 2 * 16 + 0 * 64, 1 * 16 + 0 * 64, 0 * 16 + 2 * 64,
2*16 + 2*64, 3*16 + 0*64, 1*16 + 2*64, 3*16 + 2*64, 2 * 16 + 2 * 64, 3 * 16 + 0 * 64, 1 * 16 + 2 * 64, 3 * 16 + 2 * 64,
0*16 + 1*64, 2*16 + 1*64, 0*16 + 3*64, 2*16 + 3*64, 0 * 16 + 1 * 64, 2 * 16 + 1 * 64, 0 * 16 + 3 * 64, 2 * 16 + 3 * 64,
1*16 + 1*64, 3*16 + 1*64, 1*16 + 3*64, 3*16 + 3*64, 1 * 16 + 1 * 64, 3 * 16 + 1 * 64, 1 * 16 + 3 * 64, 3 * 16 + 3 * 64,
}; };
static const uint8_t chroma_dc_scan[4]={ static const uint8_t chroma_dc_scan[4] = {
(0+0*2)*16, (1+0*2)*16, (0 + 0 * 2) * 16, (1 + 0 * 2) * 16,
(0+1*2)*16, (1+1*2)*16, (0 + 1 * 2) * 16, (1 + 1 * 2) * 16,
}; };
static const uint8_t chroma422_dc_scan[8]={ static const uint8_t chroma422_dc_scan[8] = {
(0+0*2)*16, (0+1*2)*16, (0 + 0 * 2) * 16, (0 + 1 * 2) * 16,
(1+0*2)*16, (0+2*2)*16, (1 + 0 * 2) * 16, (0 + 2 * 2) * 16,
(0+3*2)*16, (1+1*2)*16, (0 + 3 * 2) * 16, (1 + 1 * 2) * 16,
(1+2*2)*16, (1+3*2)*16, (1 + 2 * 2) * 16, (1 + 3 * 2) * 16,
}; };
// zigzag_scan8x8_cavlc[i] = zigzag_scan8x8[(i/4) + 16*(i%4)] // zigzag_scan8x8_cavlc[i] = zigzag_scan8x8[(i/4) + 16*(i%4)]
static const uint8_t zigzag_scan8x8_cavlc[64]={ static const uint8_t zigzag_scan8x8_cavlc[64] = {
0+0*8, 1+1*8, 1+2*8, 2+2*8, 0 + 0 * 8, 1 + 1 * 8, 1 + 2 * 8, 2 + 2 * 8,
4+1*8, 0+5*8, 3+3*8, 7+0*8, 4 + 1 * 8, 0 + 5 * 8, 3 + 3 * 8, 7 + 0 * 8,
3+4*8, 1+7*8, 5+3*8, 6+3*8, 3 + 4 * 8, 1 + 7 * 8, 5 + 3 * 8, 6 + 3 * 8,
2+7*8, 6+4*8, 5+6*8, 7+5*8, 2 + 7 * 8, 6 + 4 * 8, 5 + 6 * 8, 7 + 5 * 8,
1+0*8, 2+0*8, 0+3*8, 3+1*8, 1 + 0 * 8, 2 + 0 * 8, 0 + 3 * 8, 3 + 1 * 8,
3+2*8, 0+6*8, 4+2*8, 6+1*8, 3 + 2 * 8, 0 + 6 * 8, 4 + 2 * 8, 6 + 1 * 8,
2+5*8, 2+6*8, 6+2*8, 5+4*8, 2 + 5 * 8, 2 + 6 * 8, 6 + 2 * 8, 5 + 4 * 8,
3+7*8, 7+3*8, 4+7*8, 7+6*8, 3 + 7 * 8, 7 + 3 * 8, 4 + 7 * 8, 7 + 6 * 8,
0+1*8, 3+0*8, 0+4*8, 4+0*8, 0 + 1 * 8, 3 + 0 * 8, 0 + 4 * 8, 4 + 0 * 8,
2+3*8, 1+5*8, 5+1*8, 5+2*8, 2 + 3 * 8, 1 + 5 * 8, 5 + 1 * 8, 5 + 2 * 8,
1+6*8, 3+5*8, 7+1*8, 4+5*8, 1 + 6 * 8, 3 + 5 * 8, 7 + 1 * 8, 4 + 5 * 8,
4+6*8, 7+4*8, 5+7*8, 6+7*8, 4 + 6 * 8, 7 + 4 * 8, 5 + 7 * 8, 6 + 7 * 8,
0+2*8, 2+1*8, 1+3*8, 5+0*8, 0 + 2 * 8, 2 + 1 * 8, 1 + 3 * 8, 5 + 0 * 8,
1+4*8, 2+4*8, 6+0*8, 4+3*8, 1 + 4 * 8, 2 + 4 * 8, 6 + 0 * 8, 4 + 3 * 8,
0+7*8, 4+4*8, 7+2*8, 3+6*8, 0 + 7 * 8, 4 + 4 * 8, 7 + 2 * 8, 3 + 6 * 8,
5+5*8, 6+5*8, 6+6*8, 7+7*8, 5 + 5 * 8, 6 + 5 * 8, 6 + 6 * 8, 7 + 7 * 8,
}; };
static const uint8_t field_scan8x8[64]={ static const uint8_t field_scan8x8[64] = {
0+0*8, 0+1*8, 0+2*8, 1+0*8, 0 + 0 * 8, 0 + 1 * 8, 0 + 2 * 8, 1 + 0 * 8,
1+1*8, 0+3*8, 0+4*8, 1+2*8, 1 + 1 * 8, 0 + 3 * 8, 0 + 4 * 8, 1 + 2 * 8,
2+0*8, 1+3*8, 0+5*8, 0+6*8, 2 + 0 * 8, 1 + 3 * 8, 0 + 5 * 8, 0 + 6 * 8,
0+7*8, 1+4*8, 2+1*8, 3+0*8, 0 + 7 * 8, 1 + 4 * 8, 2 + 1 * 8, 3 + 0 * 8,
2+2*8, 1+5*8, 1+6*8, 1+7*8, 2 + 2 * 8, 1 + 5 * 8, 1 + 6 * 8, 1 + 7 * 8,
2+3*8, 3+1*8, 4+0*8, 3+2*8, 2 + 3 * 8, 3 + 1 * 8, 4 + 0 * 8, 3 + 2 * 8,
2+4*8, 2+5*8, 2+6*8, 2+7*8, 2 + 4 * 8, 2 + 5 * 8, 2 + 6 * 8, 2 + 7 * 8,
3+3*8, 4+1*8, 5+0*8, 4+2*8, 3 + 3 * 8, 4 + 1 * 8, 5 + 0 * 8, 4 + 2 * 8,
3+4*8, 3+5*8, 3+6*8, 3+7*8, 3 + 4 * 8, 3 + 5 * 8, 3 + 6 * 8, 3 + 7 * 8,
4+3*8, 5+1*8, 6+0*8, 5+2*8, 4 + 3 * 8, 5 + 1 * 8, 6 + 0 * 8, 5 + 2 * 8,
4+4*8, 4+5*8, 4+6*8, 4+7*8, 4 + 4 * 8, 4 + 5 * 8, 4 + 6 * 8, 4 + 7 * 8,
5+3*8, 6+1*8, 6+2*8, 5+4*8, 5 + 3 * 8, 6 + 1 * 8, 6 + 2 * 8, 5 + 4 * 8,
5+5*8, 5+6*8, 5+7*8, 6+3*8, 5 + 5 * 8, 5 + 6 * 8, 5 + 7 * 8, 6 + 3 * 8,
7+0*8, 7+1*8, 6+4*8, 6+5*8, 7 + 0 * 8, 7 + 1 * 8, 6 + 4 * 8, 6 + 5 * 8,
6+6*8, 6+7*8, 7+2*8, 7+3*8, 6 + 6 * 8, 6 + 7 * 8, 7 + 2 * 8, 7 + 3 * 8,
7+4*8, 7+5*8, 7+6*8, 7+7*8, 7 + 4 * 8, 7 + 5 * 8, 7 + 6 * 8, 7 + 7 * 8,
}; };
static const uint8_t field_scan8x8_cavlc[64]={ static const uint8_t field_scan8x8_cavlc[64] = {
0+0*8, 1+1*8, 2+0*8, 0+7*8, 0 + 0 * 8, 1 + 1 * 8, 2 + 0 * 8, 0 + 7 * 8,
2+2*8, 2+3*8, 2+4*8, 3+3*8, 2 + 2 * 8, 2 + 3 * 8, 2 + 4 * 8, 3 + 3 * 8,
3+4*8, 4+3*8, 4+4*8, 5+3*8, 3 + 4 * 8, 4 + 3 * 8, 4 + 4 * 8, 5 + 3 * 8,
5+5*8, 7+0*8, 6+6*8, 7+4*8, 5 + 5 * 8, 7 + 0 * 8, 6 + 6 * 8, 7 + 4 * 8,
0+1*8, 0+3*8, 1+3*8, 1+4*8, 0 + 1 * 8, 0 + 3 * 8, 1 + 3 * 8, 1 + 4 * 8,
1+5*8, 3+1*8, 2+5*8, 4+1*8, 1 + 5 * 8, 3 + 1 * 8, 2 + 5 * 8, 4 + 1 * 8,
3+5*8, 5+1*8, 4+5*8, 6+1*8, 3 + 5 * 8, 5 + 1 * 8, 4 + 5 * 8, 6 + 1 * 8,
5+6*8, 7+1*8, 6+7*8, 7+5*8, 5 + 6 * 8, 7 + 1 * 8, 6 + 7 * 8, 7 + 5 * 8,
0+2*8, 0+4*8, 0+5*8, 2+1*8, 0 + 2 * 8, 0 + 4 * 8, 0 + 5 * 8, 2 + 1 * 8,
1+6*8, 4+0*8, 2+6*8, 5+0*8, 1 + 6 * 8, 4 + 0 * 8, 2 + 6 * 8, 5 + 0 * 8,
3+6*8, 6+0*8, 4+6*8, 6+2*8, 3 + 6 * 8, 6 + 0 * 8, 4 + 6 * 8, 6 + 2 * 8,
5+7*8, 6+4*8, 7+2*8, 7+6*8, 5 + 7 * 8, 6 + 4 * 8, 7 + 2 * 8, 7 + 6 * 8,
1+0*8, 1+2*8, 0+6*8, 3+0*8, 1 + 0 * 8, 1 + 2 * 8, 0 + 6 * 8, 3 + 0 * 8,
1+7*8, 3+2*8, 2+7*8, 4+2*8, 1 + 7 * 8, 3 + 2 * 8, 2 + 7 * 8, 4 + 2 * 8,
3+7*8, 5+2*8, 4+7*8, 5+4*8, 3 + 7 * 8, 5 + 2 * 8, 4 + 7 * 8, 5 + 4 * 8,
6+3*8, 6+5*8, 7+3*8, 7+7*8, 6 + 3 * 8, 6 + 5 * 8, 7 + 3 * 8, 7 + 7 * 8,
}; };
typedef struct IMbInfo{ typedef struct IMbInfo {
uint16_t type; uint16_t type;
uint8_t pred_mode; uint8_t pred_mode;
uint8_t cbp; uint8_t cbp;
} IMbInfo; } IMbInfo;
static const IMbInfo i_mb_type_info[26]={ static const IMbInfo i_mb_type_info[26] = {
{MB_TYPE_INTRA4x4 , -1, -1}, { MB_TYPE_INTRA4x4, -1, -1 },
{MB_TYPE_INTRA16x16, 2, 0}, { MB_TYPE_INTRA16x16, 2, 0 },
{MB_TYPE_INTRA16x16, 1, 0}, { MB_TYPE_INTRA16x16, 1, 0 },
{MB_TYPE_INTRA16x16, 0, 0}, { MB_TYPE_INTRA16x16, 0, 0 },
{MB_TYPE_INTRA16x16, 3, 0}, { MB_TYPE_INTRA16x16, 3, 0 },
{MB_TYPE_INTRA16x16, 2, 16}, { MB_TYPE_INTRA16x16, 2, 16 },
{MB_TYPE_INTRA16x16, 1, 16}, { MB_TYPE_INTRA16x16, 1, 16 },
{MB_TYPE_INTRA16x16, 0, 16}, { MB_TYPE_INTRA16x16, 0, 16 },
{MB_TYPE_INTRA16x16, 3, 16}, { MB_TYPE_INTRA16x16, 3, 16 },
{MB_TYPE_INTRA16x16, 2, 32}, { MB_TYPE_INTRA16x16, 2, 32 },
{MB_TYPE_INTRA16x16, 1, 32}, { MB_TYPE_INTRA16x16, 1, 32 },
{MB_TYPE_INTRA16x16, 0, 32}, { MB_TYPE_INTRA16x16, 0, 32 },
{MB_TYPE_INTRA16x16, 3, 32}, { MB_TYPE_INTRA16x16, 3, 32 },
{MB_TYPE_INTRA16x16, 2, 15+0}, { MB_TYPE_INTRA16x16, 2, 15 + 0 },
{MB_TYPE_INTRA16x16, 1, 15+0}, { MB_TYPE_INTRA16x16, 1, 15 + 0 },
{MB_TYPE_INTRA16x16, 0, 15+0}, { MB_TYPE_INTRA16x16, 0, 15 + 0 },
{MB_TYPE_INTRA16x16, 3, 15+0}, { MB_TYPE_INTRA16x16, 3, 15 + 0 },
{MB_TYPE_INTRA16x16, 2, 15+16}, { MB_TYPE_INTRA16x16, 2, 15 + 16 },
{MB_TYPE_INTRA16x16, 1, 15+16}, { MB_TYPE_INTRA16x16, 1, 15 + 16 },
{MB_TYPE_INTRA16x16, 0, 15+16}, { MB_TYPE_INTRA16x16, 0, 15 + 16 },
{MB_TYPE_INTRA16x16, 3, 15+16}, { MB_TYPE_INTRA16x16, 3, 15 + 16 },
{MB_TYPE_INTRA16x16, 2, 15+32}, { MB_TYPE_INTRA16x16, 2, 15 + 32 },
{MB_TYPE_INTRA16x16, 1, 15+32}, { MB_TYPE_INTRA16x16, 1, 15 + 32 },
{MB_TYPE_INTRA16x16, 0, 15+32}, { MB_TYPE_INTRA16x16, 0, 15 + 32 },
{MB_TYPE_INTRA16x16, 3, 15+32}, { MB_TYPE_INTRA16x16, 3, 15 + 32 },
{MB_TYPE_INTRA_PCM , -1, -1}, { MB_TYPE_INTRA_PCM, -1, -1 },
}; };
typedef struct PMbInfo{ typedef struct PMbInfo {
uint16_t type; uint16_t type;
uint8_t partition_count; uint8_t partition_count;
} PMbInfo; } PMbInfo;
static const PMbInfo p_mb_type_info[5]={ static const PMbInfo p_mb_type_info[5] = {
{MB_TYPE_16x16|MB_TYPE_P0L0 , 1}, { MB_TYPE_16x16 | MB_TYPE_P0L0, 1 },
{MB_TYPE_16x8 |MB_TYPE_P0L0|MB_TYPE_P1L0, 2}, { MB_TYPE_16x8 | MB_TYPE_P0L0 | MB_TYPE_P1L0, 2 },
{MB_TYPE_8x16 |MB_TYPE_P0L0|MB_TYPE_P1L0, 2}, { MB_TYPE_8x16 | MB_TYPE_P0L0 | MB_TYPE_P1L0, 2 },
{MB_TYPE_8x8 |MB_TYPE_P0L0|MB_TYPE_P1L0, 4}, { MB_TYPE_8x8 | MB_TYPE_P0L0 | MB_TYPE_P1L0, 4 },
{MB_TYPE_8x8 |MB_TYPE_P0L0|MB_TYPE_P1L0|MB_TYPE_REF0, 4}, { MB_TYPE_8x8 | MB_TYPE_P0L0 | MB_TYPE_P1L0 | MB_TYPE_REF0, 4 },
}; };
static const PMbInfo p_sub_mb_type_info[4]={ static const PMbInfo p_sub_mb_type_info[4] = {
{MB_TYPE_16x16|MB_TYPE_P0L0 , 1}, { MB_TYPE_16x16 | MB_TYPE_P0L0, 1 },
{MB_TYPE_16x8 |MB_TYPE_P0L0 , 2}, { MB_TYPE_16x8 | MB_TYPE_P0L0, 2 },
{MB_TYPE_8x16 |MB_TYPE_P0L0 , 2}, { MB_TYPE_8x16 | MB_TYPE_P0L0, 2 },
{MB_TYPE_8x8 |MB_TYPE_P0L0 , 4}, { MB_TYPE_8x8 | MB_TYPE_P0L0, 4 },
}; };
static const PMbInfo b_mb_type_info[23]={ static const PMbInfo b_mb_type_info[23] = {
{MB_TYPE_DIRECT2|MB_TYPE_L0L1 , 1, }, { MB_TYPE_DIRECT2 | MB_TYPE_L0L1, 1, },
{MB_TYPE_16x16|MB_TYPE_P0L0 , 1, }, { MB_TYPE_16x16 | MB_TYPE_P0L0, 1, },
{MB_TYPE_16x16 |MB_TYPE_P0L1 , 1, }, { MB_TYPE_16x16 | MB_TYPE_P0L1, 1, },
{MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1 , 1, }, { MB_TYPE_16x16 | MB_TYPE_P0L0 | MB_TYPE_P0L1, 1, },
{MB_TYPE_16x8 |MB_TYPE_P0L0 |MB_TYPE_P1L0 , 2, }, { MB_TYPE_16x8 | MB_TYPE_P0L0 | MB_TYPE_P1L0, 2, },
{MB_TYPE_8x16 |MB_TYPE_P0L0 |MB_TYPE_P1L0 , 2, }, { MB_TYPE_8x16 | MB_TYPE_P0L0 | MB_TYPE_P1L0, 2, },
{MB_TYPE_16x8 |MB_TYPE_P0L1 |MB_TYPE_P1L1, 2, }, { MB_TYPE_16x8 | MB_TYPE_P0L1 | MB_TYPE_P1L1, 2, },
{MB_TYPE_8x16 |MB_TYPE_P0L1 |MB_TYPE_P1L1, 2, }, { MB_TYPE_8x16 | MB_TYPE_P0L1 | MB_TYPE_P1L1, 2, },
{MB_TYPE_16x8 |MB_TYPE_P0L0 |MB_TYPE_P1L1, 2, }, { MB_TYPE_16x8 | MB_TYPE_P0L0 | MB_TYPE_P1L1, 2, },
{MB_TYPE_8x16 |MB_TYPE_P0L0 |MB_TYPE_P1L1, 2, }, { MB_TYPE_8x16 | MB_TYPE_P0L0 | MB_TYPE_P1L1, 2, },
{MB_TYPE_16x8 |MB_TYPE_P0L1|MB_TYPE_P1L0 , 2, }, { MB_TYPE_16x8 | MB_TYPE_P0L1 | MB_TYPE_P1L0, 2, },
{MB_TYPE_8x16 |MB_TYPE_P0L1|MB_TYPE_P1L0 , 2, }, { MB_TYPE_8x16 | MB_TYPE_P0L1 | MB_TYPE_P1L0, 2, },
{MB_TYPE_16x8 |MB_TYPE_P0L0 |MB_TYPE_P1L0|MB_TYPE_P1L1, 2, }, { MB_TYPE_16x8 | MB_TYPE_P0L0 | MB_TYPE_P1L0 | MB_TYPE_P1L1, 2, },
{MB_TYPE_8x16 |MB_TYPE_P0L0 |MB_TYPE_P1L0|MB_TYPE_P1L1, 2, }, { MB_TYPE_8x16 | MB_TYPE_P0L0 | MB_TYPE_P1L0 | MB_TYPE_P1L1, 2, },
{MB_TYPE_16x8 |MB_TYPE_P0L1|MB_TYPE_P1L0|MB_TYPE_P1L1, 2, }, { MB_TYPE_16x8 | MB_TYPE_P0L1 | MB_TYPE_P1L0 | MB_TYPE_P1L1, 2, },
{MB_TYPE_8x16 |MB_TYPE_P0L1|MB_TYPE_P1L0|MB_TYPE_P1L1, 2, }, { MB_TYPE_8x16 | MB_TYPE_P0L1 | MB_TYPE_P1L0 | MB_TYPE_P1L1, 2, },
{MB_TYPE_16x8 |MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_P1L0 , 2, }, { MB_TYPE_16x8 | MB_TYPE_P0L0 | MB_TYPE_P0L1 | MB_TYPE_P1L0, 2, },
{MB_TYPE_8x16 |MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_P1L0 , 2, }, { MB_TYPE_8x16 | MB_TYPE_P0L0 | MB_TYPE_P0L1 | MB_TYPE_P1L0, 2, },
{MB_TYPE_16x8 |MB_TYPE_P0L0|MB_TYPE_P0L1 |MB_TYPE_P1L1, 2, }, { MB_TYPE_16x8 | MB_TYPE_P0L0 | MB_TYPE_P0L1 | MB_TYPE_P1L1, 2, },
{MB_TYPE_8x16 |MB_TYPE_P0L0|MB_TYPE_P0L1 |MB_TYPE_P1L1, 2, }, { MB_TYPE_8x16 | MB_TYPE_P0L0 | MB_TYPE_P0L1 | MB_TYPE_P1L1, 2, },
{MB_TYPE_16x8 |MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_P1L0|MB_TYPE_P1L1, 2, }, { MB_TYPE_16x8 | MB_TYPE_P0L0 | MB_TYPE_P0L1 | MB_TYPE_P1L0 | MB_TYPE_P1L1, 2, },
{MB_TYPE_8x16 |MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_P1L0|MB_TYPE_P1L1, 2, }, { MB_TYPE_8x16 | MB_TYPE_P0L0 | MB_TYPE_P0L1 | MB_TYPE_P1L0 | MB_TYPE_P1L1, 2, },
{MB_TYPE_8x8 |MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_P1L0|MB_TYPE_P1L1, 4, }, { MB_TYPE_8x8 | MB_TYPE_P0L0 | MB_TYPE_P0L1 | MB_TYPE_P1L0 | MB_TYPE_P1L1, 4, },
}; };
static const PMbInfo b_sub_mb_type_info[13]={ static const PMbInfo b_sub_mb_type_info[13] = {
{MB_TYPE_DIRECT2 , 1, }, { MB_TYPE_DIRECT2, 1, },
{MB_TYPE_16x16|MB_TYPE_P0L0 , 1, }, { MB_TYPE_16x16 | MB_TYPE_P0L0, 1, },
{MB_TYPE_16x16 |MB_TYPE_P0L1 , 1, }, { MB_TYPE_16x16 | MB_TYPE_P0L1, 1, },
{MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1 , 1, }, { MB_TYPE_16x16 | MB_TYPE_P0L0 | MB_TYPE_P0L1, 1, },
{MB_TYPE_16x8 |MB_TYPE_P0L0 |MB_TYPE_P1L0 , 2, }, { MB_TYPE_16x8 | MB_TYPE_P0L0 | MB_TYPE_P1L0, 2, },
{MB_TYPE_8x16 |MB_TYPE_P0L0 |MB_TYPE_P1L0 , 2, }, { MB_TYPE_8x16 | MB_TYPE_P0L0 | MB_TYPE_P1L0, 2, },
{MB_TYPE_16x8 |MB_TYPE_P0L1 |MB_TYPE_P1L1, 2, }, { MB_TYPE_16x8 | MB_TYPE_P0L1 | MB_TYPE_P1L1, 2, },
{MB_TYPE_8x16 |MB_TYPE_P0L1 |MB_TYPE_P1L1, 2, }, { MB_TYPE_8x16 | MB_TYPE_P0L1 | MB_TYPE_P1L1, 2, },
{MB_TYPE_16x8 |MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_P1L0|MB_TYPE_P1L1, 2, }, { MB_TYPE_16x8 | MB_TYPE_P0L0 | MB_TYPE_P0L1 | MB_TYPE_P1L0 | MB_TYPE_P1L1, 2, },
{MB_TYPE_8x16 |MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_P1L0|MB_TYPE_P1L1, 2, }, { MB_TYPE_8x16 | MB_TYPE_P0L0 | MB_TYPE_P0L1 | MB_TYPE_P1L0 | MB_TYPE_P1L1, 2, },
{MB_TYPE_8x8 |MB_TYPE_P0L0 |MB_TYPE_P1L0 , 4, }, { MB_TYPE_8x8 | MB_TYPE_P0L0 | MB_TYPE_P1L0, 4, },
{MB_TYPE_8x8 |MB_TYPE_P0L1 |MB_TYPE_P1L1, 4, }, { MB_TYPE_8x8 | MB_TYPE_P0L1 | MB_TYPE_P1L1, 4, },
{MB_TYPE_8x8 |MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_P1L0|MB_TYPE_P1L1, 4, }, { MB_TYPE_8x8 | MB_TYPE_P0L0 | MB_TYPE_P0L1 | MB_TYPE_P1L0 | MB_TYPE_P1L1, 4, },
}; };
static const uint8_t dequant4_coeff_init[6][3]={ static const uint8_t dequant4_coeff_init[6][3] = {
{10,13,16}, { 10, 13, 16 },
{11,14,18}, { 11, 14, 18 },
{13,16,20}, { 13, 16, 20 },
{14,18,23}, { 14, 18, 23 },
{16,20,25}, { 16, 20, 25 },
{18,23,29}, { 18, 23, 29 },
}; };
static const uint8_t dequant8_coeff_init_scan[16] = { static const uint8_t dequant8_coeff_init_scan[16] = {
0,3,4,3, 3,1,5,1, 4,5,2,5, 3,1,5,1 0, 3, 4, 3, 3, 1, 5, 1, 4, 5, 2, 5, 3, 1, 5, 1
}; };
static const uint8_t dequant8_coeff_init[6][6]={
{20,18,32,19,25,24}, static const uint8_t dequant8_coeff_init[6][6] = {
{22,19,35,21,28,26}, { 20, 18, 32, 19, 25, 24 },
{26,23,42,24,33,31}, { 22, 19, 35, 21, 28, 26 },
{28,25,45,26,35,33}, { 26, 23, 42, 24, 33, 31 },
{32,28,51,30,40,38}, { 28, 25, 45, 26, 35, 33 },
{36,32,58,34,46,43}, { 32, 28, 51, 30, 40, 38 },
{ 36, 32, 58, 34, 46, 43 },
}; };
#endif /* AVCODEC_H264DATA_H */ #endif /* AVCODEC_H264DATA_H */
libavcodec/h264pred.h
View file @ be545b8a
...@@ -35,18 +35,18 @@ ...@@ -35,18 +35,18 @@
* Prediction types * Prediction types
*/ */
//@{ //@{
#define VERT_PRED 0 #define VERT_PRED 0
#define HOR_PRED 1 #define HOR_PRED 1
#define DC_PRED 2 #define DC_PRED 2
#define DIAG_DOWN_LEFT_PRED 3 #define DIAG_DOWN_LEFT_PRED 3
#define DIAG_DOWN_RIGHT_PRED 4 #define DIAG_DOWN_RIGHT_PRED 4
#define VERT_RIGHT_PRED 5 #define VERT_RIGHT_PRED 5
#define HOR_DOWN_PRED 6 #define HOR_DOWN_PRED 6
#define VERT_LEFT_PRED 7 #define VERT_LEFT_PRED 7
#define HOR_UP_PRED 8 #define HOR_UP_PRED 8
// DC edge (not for VP8) // DC edge (not for VP8)
#define LEFT_DC_PRED 9 #define LEFT_DC_PRED 9
#define TOP_DC_PRED 10 #define TOP_DC_PRED 10
#define DC_128_PRED 11 #define DC_128_PRED 11
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
#define VERT_LEFT_PRED_RV40_NODOWN 14 #define VERT_LEFT_PRED_RV40_NODOWN 14
// VP8 specific // VP8 specific
#define TM_VP8_PRED 9 ///< "True Motion", used instead of plane #define TM_VP8_PRED 9 ///< "True Motion", used instead of plane
#define VERT_VP8_PRED 10 ///< for VP8, #VERT_PRED is the average of #define VERT_VP8_PRED 10 ///< for VP8, #VERT_PRED is the average of
///< (left col+cur col x2+right col) / 4; ///< (left col+cur col x2+right col) / 4;
///< this is the "unaveraged" one ///< this is the "unaveraged" one
...@@ -65,44 +65,53 @@ ...@@ -65,44 +65,53 @@
#define DC_127_PRED 12 #define DC_127_PRED 12
#define DC_129_PRED 13 #define DC_129_PRED 13
#define DC_PRED8x8 0 #define DC_PRED8x8 0
#define HOR_PRED8x8 1 #define HOR_PRED8x8 1
#define VERT_PRED8x8 2 #define VERT_PRED8x8 2
#define PLANE_PRED8x8 3 #define PLANE_PRED8x8 3
// DC edge // DC edge
#define LEFT_DC_PRED8x8 4 #define LEFT_DC_PRED8x8 4
#define TOP_DC_PRED8x8 5 #define TOP_DC_PRED8x8 5
#define DC_128_PRED8x8 6 #define DC_128_PRED8x8 6
// H264/SVQ3 (8x8) specific // H264/SVQ3 (8x8) specific
#define ALZHEIMER_DC_L0T_PRED8x8 7 #define ALZHEIMER_DC_L0T_PRED8x8 7
#define ALZHEIMER_DC_0LT_PRED8x8 8 #define ALZHEIMER_DC_0LT_PRED8x8 8
#define ALZHEIMER_DC_L00_PRED8x8 9 #define ALZHEIMER_DC_L00_PRED8x8 9
#define ALZHEIMER_DC_0L0_PRED8x8 10 #define ALZHEIMER_DC_0L0_PRED8x8 10
// VP8 specific // VP8 specific
#define DC_127_PRED8x8 7 #define DC_127_PRED8x8 7
#define DC_129_PRED8x8 8 #define DC_129_PRED8x8 8
//@} //@}
/** /**
* Context for storing H.264 prediction functions * Context for storing H.264 prediction functions
*/ */
typedef struct H264PredContext{ typedef struct H264PredContext {
void (*pred4x4 [9+3+3])(uint8_t *src, const uint8_t *topright, int stride);//FIXME move to dsp? void(*pred4x4[9 + 3 + 3])(uint8_t *src, const uint8_t *topright, int stride); //FIXME move to dsp?
void (*pred8x8l [9+3])(uint8_t *src, int topleft, int topright, int stride); void(*pred8x8l[9 + 3])(uint8_t *src, int topleft, int topright, int stride);
void (*pred8x8 [4+3+4])(uint8_t *src, int stride); void(*pred8x8[4 + 3 + 4])(uint8_t *src, int stride);
void (*pred16x16[4+3+2])(uint8_t *src, int stride); void(*pred16x16[4 + 3 + 2])(uint8_t *src, int stride);
void (*pred4x4_add [2])(uint8_t *pix/*align 4*/, const DCTELEM *block/*align 16*/, int stride); void(*pred4x4_add[2])(uint8_t *pix /*align 4*/,
void (*pred8x8l_add [2])(uint8_t *pix/*align 8*/, const DCTELEM *block/*align 16*/, int stride); const DCTELEM *block /*align 16*/, int stride);
void (*pred8x8_add [3])(uint8_t *pix/*align 8*/, const int *block_offset, const DCTELEM *block/*align 16*/, int stride); void(*pred8x8l_add[2])(uint8_t *pix /*align 8*/,
void (*pred16x16_add[3])(uint8_t *pix/*align 16*/, const int *block_offset, const DCTELEM *block/*align 16*/, int stride); const DCTELEM *block /*align 16*/, int stride);
}H264PredContext; void(*pred8x8_add[3])(uint8_t *pix /*align 8*/,
const int *block_offset,
const DCTELEM *block /*align 16*/, int stride);
void(*pred16x16_add[3])(uint8_t *pix /*align 16*/,
const int *block_offset,
const DCTELEM *block /*align 16*/, int stride);
} H264PredContext;
void ff_h264_pred_init(H264PredContext *h, int codec_id, const int bit_depth, const int chroma_format_idc); void ff_h264_pred_init(H264PredContext *h, int codec_id,
void ff_h264_pred_init_arm(H264PredContext *h, int codec_id, const int bit_depth, const int chroma_format_idc); const int bit_depth, const int chroma_format_idc);
void ff_h264_pred_init_x86(H264PredContext *h, int codec_id, const int bit_depth, const int chroma_format_idc); void ff_h264_pred_init_arm(H264PredContext *h, int codec_id,
const int bit_depth, const int chroma_format_idc);
void ff_h264_pred_init_x86(H264PredContext *h, int codec_id,
const int bit_depth, const int chroma_format_idc);
#endif /* AVCODEC_H264PRED_H */ #endif /* AVCODEC_H264PRED_H */
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