From bcc3476c984ad3e74757205aa8e6bcf8716aac08 Mon Sep 17 00:00:00 2001
From: Jeff Downs <heydowns@borg.com>
Date: Tue, 2 Oct 2007 14:25:47 +0000
Subject: [PATCH] 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
---
 libavcodec/h264.h      | 10 ++++++----
 libavcodec/mpegvideo.h |  5 +++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index 8dd6cdd1af..0fd28ad632 100644
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@ -84,8 +84,8 @@ typedef struct SPS{
     int poc_cycle_length;              ///< num_ref_frames_in_pic_order_cnt_cycle
     int ref_frame_count;               ///< num_ref_frames
     int gaps_in_frame_num_allowed_flag;
-    int mb_width;                      ///< frame_width_in_mbs_minus1 + 1
-    int mb_height;                     ///< frame_height_in_mbs_minus1 + 1
+    int mb_width;                      ///< pic_width_in_mbs_minus1 + 1
+    int mb_height;                     ///< pic_height_in_map_units_minus1 + 1
     int frame_mbs_only_flag;
     int mb_aff;                        ///<mb_adaptive_frame_field_flag
     int direct_8x8_inference_flag;
@@ -323,8 +323,10 @@ typedef struct H264Context{
     unsigned int list_count;
     Picture *short_ref[32];
     Picture *long_ref[32];
-    Picture default_ref_list[2][32];
-    Picture ref_list[2][48];     ///< 0..15: frame refs, 16..47: mbaff field refs
+    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.
+                                          Reordered version of default_ref_list
+                                          according to picture reordering in slice header */
     Picture *delayed_pic[18]; //FIXME size?
     Picture *delayed_output_pic;
 
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h
index 86cd39e638..4e39902392 100644
--- a/libavcodec/mpegvideo.h
+++ b/libavcodec/mpegvideo.h
@@ -138,8 +138,9 @@ typedef struct Picture{
 
     int field_poc[2];           ///< h264 top/bottom POC
     int poc;                    ///< h264 frame POC
-    int frame_num;              ///< h264 frame_num
-    int pic_id;                 ///< h264 pic_num or long_term_pic_idx
+    int frame_num;              ///< h264 frame_num (raw frame_num from slice header)
+    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 ref_poc[2][16];         ///< h264 POCs of the frames used as reference
     int ref_count[2];           ///< number of entries in ref_poc