virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

avcodec/hevcdec: move SliceHeader struct definition to hevc_ps

Browse Source 
This is in preparation for a following patch.

Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Reviewed-by: Aaron Levinson <alevinsn@aracnet.com>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-04-30 16:52:51 -03:00
parent 1d53b8e907
commit 4aaace8b25
2 changed files with 83 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
libavcodec/hevc_ps.h
View File

@ -39,6 +39,89 @@ typedef struct ShortTermRPS {
uint8_t used[32]; uint8_t used[32];
} ShortTermRPS; } ShortTermRPS;
typedef struct LongTermRPS {
int poc[32];
uint8_t used[32];
uint8_t nb_refs;
} LongTermRPS;
typedef struct SliceHeader {
unsigned int pps_id;
///< address (in raster order) of the first block in the current slice segment
unsigned int slice_segment_addr;
///< address (in raster order) of the first block in the current slice
unsigned int slice_addr;
enum HEVCSliceType slice_type;
int pic_order_cnt_lsb;
uint8_t first_slice_in_pic_flag;
uint8_t dependent_slice_segment_flag;
uint8_t pic_output_flag;
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;
int long_term_ref_pic_set_size;
LongTermRPS long_term_rps;
unsigned int list_entry_lx[2][32];
uint8_t rpl_modification_flag[2];
uint8_t no_output_of_prior_pics_flag;
uint8_t slice_temporal_mvp_enabled_flag;
unsigned int nb_refs[2];
uint8_t slice_sample_adaptive_offset_flag[3];
uint8_t mvd_l1_zero_flag;
uint8_t cabac_init_flag;
uint8_t disable_deblocking_filter_flag; ///< slice_header_disable_deblocking_filter_flag
uint8_t slice_loop_filter_across_slices_enabled_flag;
uint8_t collocated_list;
unsigned int collocated_ref_idx;
int slice_qp_delta;
int slice_cb_qp_offset;
int slice_cr_qp_offset;
uint8_t cu_chroma_qp_offset_enabled_flag;
int beta_offset; ///< beta_offset_div2 * 2
int tc_offset; ///< tc_offset_div2 * 2
unsigned int max_num_merge_cand; ///< 5 - 5_minus_max_num_merge_cand
unsigned *entry_point_offset;
int * offset;
int * size;
int num_entry_point_offsets;
int8_t slice_qp;
uint8_t luma_log2_weight_denom;
int16_t chroma_log2_weight_denom;
int16_t luma_weight_l0[16];
int16_t chroma_weight_l0[16][2];
int16_t chroma_weight_l1[16][2];
int16_t luma_weight_l1[16];
int16_t luma_offset_l0[16];
int16_t chroma_offset_l0[16][2];
int16_t luma_offset_l1[16];
int16_t chroma_offset_l1[16][2];
int slice_ctb_addr_rs;
} SliceHeader;
typedef struct HEVCWindow { typedef struct HEVCWindow {
unsigned int left_offset; unsigned int left_offset;
unsigned int right_offset; unsigned int right_offset;

83
libavcodec/hevcdec.h
View File

@ -227,12 +227,6 @@ enum ScanType {
SCAN_VERT, SCAN_VERT,
}; };
typedef struct LongTermRPS {
int poc[32];
uint8_t used[32];
uint8_t nb_refs;
} LongTermRPS;
typedef struct RefPicList { typedef struct RefPicList {
struct HEVCFrame *ref[HEVC_MAX_REFS]; struct HEVCFrame *ref[HEVC_MAX_REFS];
int list[HEVC_MAX_REFS]; int list[HEVC_MAX_REFS];
@ -244,83 +238,6 @@ typedef struct RefPicListTab {
RefPicList refPicList[2]; RefPicList refPicList[2];
} RefPicListTab; } RefPicListTab;
typedef struct SliceHeader {
unsigned int pps_id;
///< address (in raster order) of the first block in the current slice segment
unsigned int slice_segment_addr;
///< address (in raster order) of the first block in the current slice
unsigned int slice_addr;
enum HEVCSliceType slice_type;
int pic_order_cnt_lsb;
uint8_t first_slice_in_pic_flag;
uint8_t dependent_slice_segment_flag;
uint8_t pic_output_flag;
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;
int long_term_ref_pic_set_size;
LongTermRPS long_term_rps;
unsigned int list_entry_lx[2][32];
uint8_t rpl_modification_flag[2];
uint8_t no_output_of_prior_pics_flag;
uint8_t slice_temporal_mvp_enabled_flag;
unsigned int nb_refs[2];
uint8_t slice_sample_adaptive_offset_flag[3];
uint8_t mvd_l1_zero_flag;
uint8_t cabac_init_flag;
uint8_t disable_deblocking_filter_flag; ///< slice_header_disable_deblocking_filter_flag
uint8_t slice_loop_filter_across_slices_enabled_flag;
uint8_t collocated_list;
unsigned int collocated_ref_idx;
int slice_qp_delta;
int slice_cb_qp_offset;
int slice_cr_qp_offset;
uint8_t cu_chroma_qp_offset_enabled_flag;
int beta_offset; ///< beta_offset_div2 * 2
int tc_offset; ///< tc_offset_div2 * 2
unsigned int max_num_merge_cand; ///< 5 - 5_minus_max_num_merge_cand
unsigned *entry_point_offset;
int * offset;
int * size;
int num_entry_point_offsets;
int8_t slice_qp;
uint8_t luma_log2_weight_denom;
int16_t chroma_log2_weight_denom;
int16_t luma_weight_l0[16];
int16_t chroma_weight_l0[16][2];
int16_t chroma_weight_l1[16][2];
int16_t luma_weight_l1[16];
int16_t luma_offset_l0[16];
int16_t chroma_offset_l0[16][2];
int16_t luma_offset_l1[16];
int16_t chroma_offset_l1[16][2];
int slice_ctb_addr_rs;
} SliceHeader;
typedef struct CodingUnit { typedef struct CodingUnit {
int x; int x;
int y; int y;