Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: deMpegEncContextize

Conflicts:
	libavcodec/dxva2_h264.c
	libavcodec/h264.c
	libavcodec/h264.h
	libavcodec/h264_cabac.c
	libavcodec/h264_cavlc.c
	libavcodec/h264_loopfilter.c
	libavcodec/h264_mb_template.c
	libavcodec/h264_parser.c
	libavcodec/h264_ps.c
	libavcodec/h264_refs.c
	libavcodec/h264_sei.c
	libavcodec/svq3.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 57 insertions, 65 deletions

diff --git a/libavcodec/h264_sei.c b/libavcodec/h264_sei.c
index 62320e2d6a..ece54f1007 100644
--- a/libavcodec/h264_sei.c
+++ b/libavcodec/h264_sei.c
@@ -45,14 +45,13 @@ void ff_h264_reset_sei(H264Context *h) {
 }
 
 static int decode_picture_timing(H264Context *h){
-    MpegEncContext * const s = &h->s;
     if(h->sps.nal_hrd_parameters_present_flag || h->sps.vcl_hrd_parameters_present_flag){
-        h->sei_cpb_removal_delay = get_bits_long(&s->gb, h->sps.cpb_removal_delay_length);
-        h->sei_dpb_output_delay = get_bits_long(&s->gb, h->sps.dpb_output_delay_length);
+        h->sei_cpb_removal_delay = get_bits_long(&h->gb, h->sps.cpb_removal_delay_length);
+        h->sei_dpb_output_delay = get_bits_long(&h->gb, h->sps.dpb_output_delay_length);
     }
     if(h->sps.pic_struct_present_flag){
         unsigned int i, num_clock_ts;
-        h->sei_pic_struct = get_bits(&s->gb, 4);
+        h->sei_pic_struct = get_bits(&h->gb, 4);
         h->sei_ct_type    = 0;
 
         if (h->sei_pic_struct > SEI_PIC_STRUCT_FRAME_TRIPLING)
@@ -61,42 +60,41 @@ static int decode_picture_timing(H264Context *h){
         num_clock_ts = sei_num_clock_ts_table[h->sei_pic_struct];
 
         for (i = 0 ; i < num_clock_ts ; i++){
-            if(get_bits(&s->gb, 1)){                  /* clock_timestamp_flag */
+            if(get_bits(&h->gb, 1)){                  /* clock_timestamp_flag */
                 unsigned int full_timestamp_flag;
-                h->sei_ct_type |= 1<<get_bits(&s->gb, 2);
-                skip_bits(&s->gb, 1);                 /* nuit_field_based_flag */
-                skip_bits(&s->gb, 5);                 /* counting_type */
-                full_timestamp_flag = get_bits(&s->gb, 1);
-                skip_bits(&s->gb, 1);                 /* discontinuity_flag */
-                skip_bits(&s->gb, 1);                 /* cnt_dropped_flag */
-                skip_bits(&s->gb, 8);                 /* n_frames */
+                h->sei_ct_type |= 1<<get_bits(&h->gb, 2);
+                skip_bits(&h->gb, 1);                 /* nuit_field_based_flag */
+                skip_bits(&h->gb, 5);                 /* counting_type */
+                full_timestamp_flag = get_bits(&h->gb, 1);
+                skip_bits(&h->gb, 1);                 /* discontinuity_flag */
+                skip_bits(&h->gb, 1);                 /* cnt_dropped_flag */
+                skip_bits(&h->gb, 8);                 /* n_frames */
                 if(full_timestamp_flag){
-                    skip_bits(&s->gb, 6);             /* seconds_value 0..59 */
-                    skip_bits(&s->gb, 6);             /* minutes_value 0..59 */
-                    skip_bits(&s->gb, 5);             /* hours_value 0..23 */
+                    skip_bits(&h->gb, 6);             /* seconds_value 0..59 */
+                    skip_bits(&h->gb, 6);             /* minutes_value 0..59 */
+                    skip_bits(&h->gb, 5);             /* hours_value 0..23 */
                 }else{
-                    if(get_bits(&s->gb, 1)){          /* seconds_flag */
-                        skip_bits(&s->gb, 6);         /* seconds_value range 0..59 */
-                        if(get_bits(&s->gb, 1)){      /* minutes_flag */
-                            skip_bits(&s->gb, 6);     /* minutes_value 0..59 */
-                            if(get_bits(&s->gb, 1))   /* hours_flag */
-                                skip_bits(&s->gb, 5); /* hours_value 0..23 */
+                    if(get_bits(&h->gb, 1)){          /* seconds_flag */
+                        skip_bits(&h->gb, 6);         /* seconds_value range 0..59 */
+                        if(get_bits(&h->gb, 1)){      /* minutes_flag */
+                            skip_bits(&h->gb, 6);     /* minutes_value 0..59 */
+                            if(get_bits(&h->gb, 1))   /* hours_flag */
+                                skip_bits(&h->gb, 5); /* hours_value 0..23 */
                         }
                     }
                 }
                 if(h->sps.time_offset_length > 0)
-                    skip_bits(&s->gb, h->sps.time_offset_length); /* time_offset */
+                    skip_bits(&h->gb, h->sps.time_offset_length); /* time_offset */
             }
         }
 
-        if(s->avctx->debug & FF_DEBUG_PICT_INFO)
-            av_log(s->avctx, AV_LOG_DEBUG, "ct_type:%X pic_struct:%d\n", h->sei_ct_type, h->sei_pic_struct);
+        if(h->avctx->debug & FF_DEBUG_PICT_INFO)
+            av_log(h->avctx, AV_LOG_DEBUG, "ct_type:%X pic_struct:%d\n", h->sei_ct_type, h->sei_pic_struct);
     }
     return 0;
 }
 
 static int decode_user_data_itu_t_t35(H264Context *h, int size) {
-    MpegEncContext * const s = &h->s;
     uint32_t user_identifier;
     int dtg_active_format;
 
@@ -104,28 +102,28 @@ static int decode_user_data_itu_t_t35(H264Context *h, int size) {
         return -1;
     size -= 7;
 
-    skip_bits(&s->gb, 8);   // country_code
-    skip_bits(&s->gb, 16);  // provider_code
-    user_identifier = get_bits_long(&s->gb, 32);
+    skip_bits(&h->gb, 8);   // country_code
+    skip_bits(&h->gb, 16);  // provider_code
+    user_identifier = get_bits_long(&h->gb, 32);
 
     switch (user_identifier) {
         case 0x44544731:    // "DTG1" - AFD_data
             if (size < 1)
                 return -1;
-            skip_bits(&s->gb, 1);
-            if (get_bits(&s->gb, 1)) {
-                skip_bits(&s->gb, 6);
+            skip_bits(&h->gb, 1);
+            if (get_bits(&h->gb, 1)) {
+                skip_bits(&h->gb, 6);
                 if (size < 2)
                     return -1;
-                skip_bits(&s->gb, 4);
-                dtg_active_format = get_bits(&s->gb, 4);
-                s->avctx->dtg_active_format = dtg_active_format;
+                skip_bits(&h->gb, 4);
+                dtg_active_format = get_bits(&h->gb, 4);
+                h->avctx->dtg_active_format = dtg_active_format;
             } else {
-                skip_bits(&s->gb, 6);
+                skip_bits(&h->gb, 6);
             }
             break;
         default:
-            skip_bits(&s->gb, size * 8);
+            skip_bits(&h->gb, size * 8);
             break;
     }
 
@@ -133,7 +131,6 @@ static int decode_user_data_itu_t_t35(H264Context *h, int size) {
 }
 
 static int decode_unregistered_user_data(H264Context *h, int size){
-    MpegEncContext * const s = &h->s;
     uint8_t user_data[16+256];
     int e, build, i;
 
@@ -141,7 +138,7 @@ static int decode_unregistered_user_data(H264Context *h, int size){
         return -1;
 
     for(i=0; i<sizeof(user_data)-1 && i<size; i++){
-        user_data[i]= get_bits(&s->gb, 8);
+        user_data[i]= get_bits(&h->gb, 8);
     }
 
     user_data[i]= 0;
@@ -151,33 +148,30 @@ static int decode_unregistered_user_data(H264Context *h, int size){
     if(e==1 && build==1 && !strncmp(user_data+16, "x264 - core 0000", 16))
         h->x264_build = 67;
 
-    if(s->avctx->debug & FF_DEBUG_BUGS)
-        av_log(s->avctx, AV_LOG_DEBUG, "user data:\"%s\"\n", user_data+16);
+    if(h->avctx->debug & FF_DEBUG_BUGS)
+        av_log(h->avctx, AV_LOG_DEBUG, "user data:\"%s\"\n", user_data+16);
 
     for(; i<size; i++)
-        skip_bits(&s->gb, 8);
+        skip_bits(&h->gb, 8);
 
     return 0;
 }
 
 static int decode_recovery_point(H264Context *h){
-    MpegEncContext * const s = &h->s;
-
-    h->sei_recovery_frame_cnt = get_ue_golomb(&s->gb);
-    skip_bits(&s->gb, 4);       /* 1b exact_match_flag, 1b broken_link_flag, 2b changing_slice_group_idc */
+    h->sei_recovery_frame_cnt = get_ue_golomb(&h->gb);
+    skip_bits(&h->gb, 4);       /* 1b exact_match_flag, 1b broken_link_flag, 2b changing_slice_group_idc */
 
     return 0;
 }
 
 static int decode_buffering_period(H264Context *h){
-    MpegEncContext * const s = &h->s;
     unsigned int sps_id;
     int sched_sel_idx;
     SPS *sps;
 
-    sps_id = get_ue_golomb_31(&s->gb);
+    sps_id = get_ue_golomb_31(&h->gb);
     if(sps_id > 31 || !h->sps_buffers[sps_id]) {
-        av_log(h->s.avctx, AV_LOG_ERROR, "non-existing SPS %d referenced in buffering period\n", sps_id);
+        av_log(h->avctx, AV_LOG_ERROR, "non-existing SPS %d referenced in buffering period\n", sps_id);
         return -1;
     }
     sps = h->sps_buffers[sps_id];
@@ -185,14 +179,14 @@ static int decode_buffering_period(H264Context *h){
     // NOTE: This is really so duplicated in the standard... See H.264, D.1.1
     if (sps->nal_hrd_parameters_present_flag) {
         for (sched_sel_idx = 0; sched_sel_idx < sps->cpb_cnt; sched_sel_idx++) {
-            h->initial_cpb_removal_delay[sched_sel_idx] = get_bits_long(&s->gb, sps->initial_cpb_removal_delay_length);
-            skip_bits(&s->gb, sps->initial_cpb_removal_delay_length); // initial_cpb_removal_delay_offset
+            h->initial_cpb_removal_delay[sched_sel_idx] = get_bits_long(&h->gb, sps->initial_cpb_removal_delay_length);
+            skip_bits(&h->gb, sps->initial_cpb_removal_delay_length); // initial_cpb_removal_delay_offset
         }
     }
     if (sps->vcl_hrd_parameters_present_flag) {
         for (sched_sel_idx = 0; sched_sel_idx < sps->cpb_cnt; sched_sel_idx++) {
-            h->initial_cpb_removal_delay[sched_sel_idx] = get_bits_long(&s->gb, sps->initial_cpb_removal_delay_length);
-            skip_bits(&s->gb, sps->initial_cpb_removal_delay_length); // initial_cpb_removal_delay_offset
+            h->initial_cpb_removal_delay[sched_sel_idx] = get_bits_long(&h->gb, sps->initial_cpb_removal_delay_length);
+            skip_bits(&h->gb, sps->initial_cpb_removal_delay_length); // initial_cpb_removal_delay_offset
         }
     }
 
@@ -201,27 +195,25 @@ static int decode_buffering_period(H264Context *h){
 }
 
 int ff_h264_decode_sei(H264Context *h){
-    MpegEncContext * const s = &h->s;
-
-    while (get_bits_left(&s->gb) > 16) {
+    while (get_bits_left(&h->gb) > 16) {
         int size, type;
 
         type=0;
         do{
-            if (get_bits_left(&s->gb) < 8)
+            if (get_bits_left(&h->gb) < 8)
                 return -1;
-            type+= show_bits(&s->gb, 8);
-        }while(get_bits(&s->gb, 8) == 255);
+            type+= show_bits(&h->gb, 8);
+        }while(get_bits(&h->gb, 8) == 255);
 
         size=0;
         do{
-            if (get_bits_left(&s->gb) < 8)
+            if (get_bits_left(&h->gb) < 8)
                 return -1;
-            size+= show_bits(&s->gb, 8);
-        }while(get_bits(&s->gb, 8) == 255);
+            size+= show_bits(&h->gb, 8);
+        }while(get_bits(&h->gb, 8) == 255);
 
-        if(s->avctx->debug&FF_DEBUG_STARTCODE)
-            av_log(h->s.avctx, AV_LOG_DEBUG, "SEI %d len:%d\n", type, size);
+        if(h->avctx->debug&FF_DEBUG_STARTCODE)
+            av_log(h->avctx, AV_LOG_DEBUG, "SEI %d len:%d\n", type, size);
 
         switch(type){
         case SEI_TYPE_PIC_TIMING: // Picture timing SEI
@@ -245,11 +237,11 @@ int ff_h264_decode_sei(H264Context *h){
                 return -1;
             break;
         default:
-            skip_bits(&s->gb, 8*size);
+            skip_bits(&h->gb, 8*size);
         }
 
         //FIXME check bits here
-        align_get_bits(&s->gb);
+        align_get_bits(&h->gb);
     }
 
     return 0;