RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Cosmetic preparations for h264/PAFF implementation. 

patch by Jeff Downs, heydowns a borg d com
original thread:
Subject: [FFmpeg-devel] [PATCH] Implement PAFF in H.264
Date: 18/09/07 20:30

Originally committed as revision 10645 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Jeff Downs 2007-10-02 14:25:47 +00:00 committed by Andreas Öman
parent b1ef3dfd2b
commit bcc3476c98
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/h264.h
View File

@ -84,8 +84,8 @@ typedef struct SPS{
int poc_cycle_length; ///< num_ref_frames_in_pic_order_cnt_cycle int poc_cycle_length; ///< num_ref_frames_in_pic_order_cnt_cycle
int ref_frame_count; ///< num_ref_frames int ref_frame_count; ///< num_ref_frames
int gaps_in_frame_num_allowed_flag; int gaps_in_frame_num_allowed_flag;
int mb_width; ///< frame_width_in_mbs_minus1 + 1 int mb_width; ///< pic_width_in_mbs_minus1 + 1
int mb_height; ///< frame_height_in_mbs_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;
@ -323,8 +323,10 @@ typedef struct H264Context{
unsigned int list_count; unsigned int list_count;
Picture *short_ref[32]; Picture *short_ref[32];
Picture *long_ref[32]; Picture *long_ref[32];
Picture default_ref_list[2][32]; Picture default_ref_list[2][32]; ///< base reference list for all slices of a coded picture
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
according to picture reordering in slice header */
Picture *delayed_pic[18]; //FIXME size? Picture *delayed_pic[18]; //FIXME size?
Picture *delayed_output_pic; Picture *delayed_output_pic;

5
libavcodec/mpegvideo.h
View File

@ -138,8 +138,9 @@ typedef struct Picture{
int field_poc[2]; ///< h264 top/bottom POC int field_poc[2]; ///< h264 top/bottom POC
int poc; ///< h264 frame POC int poc; ///< h264 frame POC
int frame_num; ///< h264 frame_num int frame_num; ///< h264 frame_num (raw frame_num from slice header)
int pic_id; ///< h264 pic_num or long_term_pic_idx int pic_id; /**< h264 pic_num (short -> no wrap version of pic_num,
pic_num & max_pic_num; long -> long_pic_num) */
int long_ref; ///< 1->long term reference 0->short term reference int long_ref; ///< 1->long term reference 0->short term reference
int ref_poc[2][16]; ///< h264 POCs of the frames used as reference int ref_poc[2][16]; ///< h264 POCs of the frames used as reference
int ref_count[2]; ///< number of entries in ref_poc int ref_count[2]; ///< number of entries in ref_poc