From 2c541554076cc8a72e7145d4da30389ca763f32f Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sun, 3 Feb 2013 11:10:05 +0100 Subject: h264: deMpegEncContextize Most of the changes are just trivial are just trivial replacements of fields from MpegEncContext with equivalent fields in H264Context. Everything in h264* other than h264.c are those trivial changes. The nontrivial parts are: 1) extracting a simplified version of the frame management code from mpegvideo.c. We don't need last/next_picture anymore, since h264 uses its own more complex system already and those were set only to appease the mpegvideo parts. 2) some tables that need to be allocated/freed in appropriate places. 3) hwaccels -- mostly trivial replacements. for dxva, the draw_horiz_band() call is moved from ff_dxva2_common_end_frame() to per-codec end_frame() callbacks, because it's now different for h264 and MpegEncContext-based decoders. 4) svq3 -- it does not use h264 complex reference system, so I just added some very simplistic frame management instead and dropped the use of ff_h264_frame_start(). Because of this I also had to move some initialization code to svq3. Additional fixes for chroma format and bit depth changes by Janne Grunau Signed-off-by: Anton Khirnov --- libavcodec/h264_direct.c | 73 ++++++++++++++++++++++-------------------------- 1 file changed, 34 insertions(+), 39 deletions(-) (limited to 'libavcodec/h264_direct.c') diff --git a/libavcodec/h264_direct.c b/libavcodec/h264_direct.c index 2306b975b5..e7a0b6188f 100644 --- a/libavcodec/h264_direct.c +++ b/libavcodec/h264_direct.c @@ -50,14 +50,13 @@ static int get_scale_factor(H264Context * const h, int poc, int poc1, int i){ } void ff_h264_direct_dist_scale_factor(H264Context * const h){ - MpegEncContext * const s = &h->s; - const int poc = h->s.current_picture_ptr->field_poc[ s->picture_structure == PICT_BOTTOM_FIELD ]; + const int poc = h->cur_pic_ptr->field_poc[h->picture_structure == PICT_BOTTOM_FIELD]; const int poc1 = h->ref_list[1][0].poc; int i, field; if (FRAME_MBAFF) for (field = 0; field < 2; field++){ - const int poc = h->s.current_picture_ptr->field_poc[field]; + const int poc = h->cur_pic_ptr->field_poc[field]; const int poc1 = h->ref_list[1][0].field_poc[field]; for (i = 0; i < 2 * h->ref_count[0]; i++) h->dist_scale_factor_field[field][i^field] = @@ -70,12 +69,11 @@ void ff_h264_direct_dist_scale_factor(H264Context * const h){ } static void fill_colmap(H264Context *h, int map[2][16+32], int list, int field, int colfield, int mbafi){ - MpegEncContext * const s = &h->s; Picture * const ref1 = &h->ref_list[1][0]; int j, old_ref, rfield; int start= mbafi ? 16 : 0; int end = mbafi ? 16+2*h->ref_count[0] : h->ref_count[0]; - int interl= mbafi || s->picture_structure != PICT_FRAME; + int interl= mbafi || h->picture_structure != PICT_FRAME; /* bogus; fills in for missing frames */ memset(map[list], 0, sizeof(map[list])); @@ -104,11 +102,10 @@ static void fill_colmap(H264Context *h, int map[2][16+32], int list, int field, } void ff_h264_direct_ref_list_init(H264Context * const h){ - MpegEncContext * const s = &h->s; Picture * const ref1 = &h->ref_list[1][0]; - Picture * const cur = s->current_picture_ptr; + Picture * const cur = h->cur_pic_ptr; int list, j, field; - int sidx= (s->picture_structure&1)^1; + int sidx= (h->picture_structure&1)^1; int ref1sidx = (ref1->f.reference&1)^1; for(list=0; list<2; list++){ @@ -117,7 +114,7 @@ void ff_h264_direct_ref_list_init(H264Context * const h){ cur->ref_poc[sidx][list][j] = 4 * h->ref_list[list][j].frame_num + (h->ref_list[list][j].f.reference & 3); } - if(s->picture_structure == PICT_FRAME){ + if(h->picture_structure == PICT_FRAME){ memcpy(cur->ref_count[1], cur->ref_count[0], sizeof(cur->ref_count[0])); memcpy(cur->ref_poc [1], cur->ref_poc [0], sizeof(cur->ref_poc [0])); } @@ -125,12 +122,12 @@ void ff_h264_direct_ref_list_init(H264Context * const h){ cur->mbaff= FRAME_MBAFF; h->col_fieldoff= 0; - if(s->picture_structure == PICT_FRAME){ - int cur_poc = s->current_picture_ptr->poc; + if(h->picture_structure == PICT_FRAME){ + int cur_poc = h->cur_pic_ptr->poc; int *col_poc = h->ref_list[1]->field_poc; h->col_parity= (FFABS(col_poc[0] - cur_poc) >= FFABS(col_poc[1] - cur_poc)); ref1sidx=sidx= h->col_parity; - } else if (!(s->picture_structure & h->ref_list[1][0].f.reference) && !h->ref_list[1][0].mbaff) { // FL -> FL & differ parity + } else if (!(h->picture_structure & h->ref_list[1][0].f.reference) && !h->ref_list[1][0].mbaff) { // FL -> FL & differ parity h->col_fieldoff = 2 * h->ref_list[1][0].f.reference - 3; } @@ -149,9 +146,9 @@ static void await_reference_mb_row(H264Context * const h, Picture *ref, int mb_y { int ref_field = ref->f.reference - 1; int ref_field_picture = ref->field_picture; - int ref_height = 16*h->s.mb_height >> ref_field_picture; + int ref_height = 16*h->mb_height >> ref_field_picture; - if(!HAVE_THREADS || !(h->s.avctx->active_thread_type&FF_THREAD_FRAME)) + if(!HAVE_THREADS || !(h->avctx->active_thread_type&FF_THREAD_FRAME)) return; //FIXME it can be safe to access mb stuff @@ -163,10 +160,9 @@ static void await_reference_mb_row(H264Context * const h, Picture *ref, int mb_y } static void pred_spatial_direct_motion(H264Context * const h, int *mb_type){ - MpegEncContext * const s = &h->s; int b8_stride = 2; int b4_stride = h->b_stride; - int mb_xy = h->mb_xy, mb_y = s->mb_y; + int mb_xy = h->mb_xy, mb_y = h->mb_y; int mb_type_col[2]; const int16_t (*l1mv0)[2], (*l1mv1)[2]; const int8_t *l1ref0, *l1ref1; @@ -179,7 +175,7 @@ static void pred_spatial_direct_motion(H264Context * const h, int *mb_type){ assert(h->ref_list[1][0].f.reference & 3); - await_reference_mb_row(h, &h->ref_list[1][0], s->mb_y + !!IS_INTERLACED(*mb_type)); + await_reference_mb_row(h, &h->ref_list[1][0], h->mb_y + !!IS_INTERLACED(*mb_type)); #define MB_TYPE_16x16_OR_INTRA (MB_TYPE_16x16|MB_TYPE_INTRA4x4|MB_TYPE_INTRA16x16|MB_TYPE_INTRA_PCM) @@ -241,21 +237,21 @@ static void pred_spatial_direct_motion(H264Context * const h, int *mb_type){ if (IS_INTERLACED(h->ref_list[1][0].f.mb_type[mb_xy])) { // AFL/AFR/FR/FL -> AFL/FL if (!IS_INTERLACED(*mb_type)) { // AFR/FR -> AFL/FL - mb_y = (s->mb_y&~1) + h->col_parity; - mb_xy= s->mb_x + ((s->mb_y&~1) + h->col_parity)*s->mb_stride; + mb_y = (h->mb_y&~1) + h->col_parity; + mb_xy= h->mb_x + ((h->mb_y&~1) + h->col_parity)*h->mb_stride; b8_stride = 0; }else{ mb_y += h->col_fieldoff; - mb_xy += s->mb_stride*h->col_fieldoff; // non zero for FL -> FL & differ parity + mb_xy += h->mb_stride*h->col_fieldoff; // non zero for FL -> FL & differ parity } goto single_col; }else{ // AFL/AFR/FR/FL -> AFR/FR if(IS_INTERLACED(*mb_type)){ // AFL /FL -> AFR/FR - mb_y = s->mb_y&~1; - mb_xy= s->mb_x + (s->mb_y&~1)*s->mb_stride; + mb_y = h->mb_y&~1; + mb_xy= h->mb_x + (h->mb_y&~1)*h->mb_stride; mb_type_col[0] = h->ref_list[1][0].f.mb_type[mb_xy]; - mb_type_col[1] = h->ref_list[1][0].f.mb_type[mb_xy + s->mb_stride]; - b8_stride = 2+4*s->mb_stride; + mb_type_col[1] = h->ref_list[1][0].f.mb_type[mb_xy + h->mb_stride]; + b8_stride = 2+4*h->mb_stride; b4_stride *= 6; if (IS_INTERLACED(mb_type_col[0]) != IS_INTERLACED(mb_type_col[1])) { mb_type_col[0] &= ~MB_TYPE_INTERLACED; @@ -298,7 +294,7 @@ single_col: l1ref0 = &h->ref_list[1][0].f.ref_index [0][4 * mb_xy]; l1ref1 = &h->ref_list[1][0].f.ref_index [1][4 * mb_xy]; if(!b8_stride){ - if(s->mb_y&1){ + if(h->mb_y&1){ l1ref0 += 2; l1ref1 += 2; l1mv0 += 2*b4_stride; @@ -414,10 +410,9 @@ single_col: } static void pred_temp_direct_motion(H264Context * const h, int *mb_type){ - MpegEncContext * const s = &h->s; int b8_stride = 2; int b4_stride = h->b_stride; - int mb_xy = h->mb_xy, mb_y = s->mb_y; + int mb_xy = h->mb_xy, mb_y = h->mb_y; int mb_type_col[2]; const int16_t (*l1mv0)[2], (*l1mv1)[2]; const int8_t *l1ref0, *l1ref1; @@ -427,25 +422,25 @@ static void pred_temp_direct_motion(H264Context * const h, int *mb_type){ assert(h->ref_list[1][0].f.reference & 3); - await_reference_mb_row(h, &h->ref_list[1][0], s->mb_y + !!IS_INTERLACED(*mb_type)); + await_reference_mb_row(h, &h->ref_list[1][0], h->mb_y + !!IS_INTERLACED(*mb_type)); if (IS_INTERLACED(h->ref_list[1][0].f.mb_type[mb_xy])) { // AFL/AFR/FR/FL -> AFL/FL if (!IS_INTERLACED(*mb_type)) { // AFR/FR -> AFL/FL - mb_y = (s->mb_y&~1) + h->col_parity; - mb_xy= s->mb_x + ((s->mb_y&~1) + h->col_parity)*s->mb_stride; + mb_y = (h->mb_y&~1) + h->col_parity; + mb_xy= h->mb_x + ((h->mb_y&~1) + h->col_parity)*h->mb_stride; b8_stride = 0; }else{ mb_y += h->col_fieldoff; - mb_xy += s->mb_stride*h->col_fieldoff; // non zero for FL -> FL & differ parity + mb_xy += h->mb_stride*h->col_fieldoff; // non zero for FL -> FL & differ parity } goto single_col; }else{ // AFL/AFR/FR/FL -> AFR/FR if(IS_INTERLACED(*mb_type)){ // AFL /FL -> AFR/FR - mb_y = s->mb_y&~1; - mb_xy= s->mb_x + (s->mb_y&~1)*s->mb_stride; + mb_y = h->mb_y&~1; + mb_xy= h->mb_x + (h->mb_y&~1)*h->mb_stride; mb_type_col[0] = h->ref_list[1][0].f.mb_type[mb_xy]; - mb_type_col[1] = h->ref_list[1][0].f.mb_type[mb_xy + s->mb_stride]; - b8_stride = 2+4*s->mb_stride; + mb_type_col[1] = h->ref_list[1][0].f.mb_type[mb_xy + h->mb_stride]; + b8_stride = 2+4*h->mb_stride; b4_stride *= 6; if (IS_INTERLACED(mb_type_col[0]) != IS_INTERLACED(mb_type_col[1])) { mb_type_col[0] &= ~MB_TYPE_INTERLACED; @@ -489,7 +484,7 @@ single_col: l1ref0 = &h->ref_list[1][0].f.ref_index [0][4 * mb_xy]; l1ref1 = &h->ref_list[1][0].f.ref_index [1][4 * mb_xy]; if(!b8_stride){ - if(s->mb_y&1){ + if(h->mb_y&1){ l1ref0 += 2; l1ref1 += 2; l1mv0 += 2*b4_stride; @@ -503,9 +498,9 @@ single_col: int ref_offset; if(FRAME_MBAFF && IS_INTERLACED(*mb_type)){ - map_col_to_list0[0] = h->map_col_to_list0_field[s->mb_y&1][0]; - map_col_to_list0[1] = h->map_col_to_list0_field[s->mb_y&1][1]; - dist_scale_factor =h->dist_scale_factor_field[s->mb_y&1]; + map_col_to_list0[0] = h->map_col_to_list0_field[h->mb_y&1][0]; + map_col_to_list0[1] = h->map_col_to_list0_field[h->mb_y&1][1]; + dist_scale_factor =h->dist_scale_factor_field[h->mb_y&1]; } ref_offset = (h->ref_list[1][0].mbaff<<4) & (mb_type_col[0]>>3); //if(h->ref_list[1][0].mbaff && IS_INTERLACED(mb_type_col[0])) ref_offset=16 else 0 -- cgit v1.2.3