libavcodec.hg: h264.c comparison

comparison h264.c @ 2310:c5cd8a064c34 libavcodec

H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)

author	michael
date	Fri, 22 Oct 2004 18:30:50 +0000
parents	6d26e105f68f
children	cdbb2f30e08b

comparison

equal deleted inserted replaced

-:550ae8914fd3
+:c5cd8a064c34
 if( get_cabac( &h->cabac, &h->cabac_state[17+3] ) )
 mb_type += 1;
 return mb_type;
 }
+} else if( h->slice_type == B_TYPE ) {
+const int mb_xy= s->mb_x + s->mb_y*s->mb_stride;
+int ctx = 0;
+int bits;
+if( s->mb_x > 0 && !IS_SKIP( s->current_picture.mb_type[mb_xy-1] )
+&& !IS_DIRECT( s->current_picture.mb_type[mb_xy-1] ) )
+ctx++;
+if( s->mb_y > 0 && !IS_SKIP( s->current_picture.mb_type[mb_xy-s->mb_stride] )
+&& !IS_DIRECT( s->current_picture.mb_type[mb_xy-s->mb_stride] ) )
+ctx++;
+if( !get_cabac( &h->cabac, &h->cabac_state[27+ctx] ) )
+return 0; /* B_Direct_16x16 */
+if( !get_cabac( &h->cabac, &h->cabac_state[27+3] ) ) {
+return 1 + get_cabac( &h->cabac, &h->cabac_state[27+5] ); /* B_L[01]_16x16 */
+}
+bits = get_cabac( &h->cabac, &h->cabac_state[27+4] ) << 3;
+bits|= get_cabac( &h->cabac, &h->cabac_state[27+5] ) << 2;
+bits|= get_cabac( &h->cabac, &h->cabac_state[27+5] ) << 1;
+bits|= get_cabac( &h->cabac, &h->cabac_state[27+5] );
+if( bits < 8 )
+return bits + 3; /* B_Bi_16x16 through B_L1_L0_16x8 */
+else if( bits == 13 ) {
+int mb_type;
+/* I-type */
+if( get_cabac( &h->cabac, &h->cabac_state[32] ) == 0 )
+return 23+0; /* I_4x4 */
+if( get_cabac_terminate( &h->cabac ) )
+return 23+25; /* I_PCM */
+mb_type = 23+1;   /* I_16x16 */
+if( get_cabac( &h->cabac, &h->cabac_state[32+1] ) )
+mb_type += 12;  /* cbp_luma != 0 */
+if( get_cabac( &h->cabac, &h->cabac_state[32+2] ) ) {
+if( get_cabac( &h->cabac, &h->cabac_state[32+2] ) )
+mb_type += 4 * 2;   /* cbp_chroma == 2 */
+else
+mb_type += 4 * 1;   /* cbp_chroma == 1 */
+}
+if( get_cabac( &h->cabac, &h->cabac_state[32+3] ) )
+mb_type += 2;
+if( get_cabac( &h->cabac, &h->cabac_state[32+3] ) )
+mb_type += 1;
+return mb_type;
+} else if( bits == 14 )
+return 11; /* B_L1_L0_8x16 */
+else if( bits == 15 )
+return 22; /* B_8x8 */
+bits= ( bits<<1 ) | get_cabac( &h->cabac, &h->cabac_state[27+5] );
+return bits - 4; /* B_L0_Bi_* through B_Bi_Bi_* */
 } else {
-/* TODO do others frames types */
+/* TODO SI/SP frames? */
 return -1;
 }
 }
 static int decode_cabac_mb_skip( H264Context *h) {
 if( val&0x01 )
 return (val + 1)/2;
 else
 return -(val + 1)/2;
 }
-static int decode_cabac_mb_sub_type( H264Context *h ) {
+static int decode_cabac_p_mb_sub_type( H264Context *h ) {
 if( get_cabac( &h->cabac, &h->cabac_state[21] ) )
 return 0;   /* 8x8 */
 if( !get_cabac( &h->cabac, &h->cabac_state[22] ) )
 return 1;   /* 8x4 */
 if( get_cabac( &h->cabac, &h->cabac_state[23] ) )
 return 2;   /* 4x8 */
 return 3;       /* 4x4 */
+}
+static int decode_cabac_b_mb_sub_type( H264Context *h ) {
+int type;
+if( !get_cabac( &h->cabac, &h->cabac_state[36] ) )
+return 0;   /* B_Direct_8x8 */
+if( !get_cabac( &h->cabac, &h->cabac_state[37] ) )
+return 1 + get_cabac( &h->cabac, &h->cabac_state[38] ); /* B_L0_8x8, B_L1_8x8 */
+type = 3;
+if( get_cabac( &h->cabac, &h->cabac_state[38] ) ) {
+if( get_cabac( &h->cabac, &h->cabac_state[39] ) )
+return 11 + get_cabac( &h->cabac, &h->cabac_state[39] ); /* B_L1_4x4, B_Bi_4x4 */
+type += 4;
+}
+type += 2*get_cabac( &h->cabac, &h->cabac_state[39] );
+type +=   get_cabac( &h->cabac, &h->cabac_state[39] );
+return type;
 }
 static int decode_cabac_mb_ref( H264Context *h, int list, int n ) {
 int refa = h->ref_cache[list][scan8[n] - 1];
 int refb = h->ref_cache[list][scan8[n] - 8];
 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride;
 int mb_type, partition_count, cbp = 0;
 s->dsp.clear_blocks(h->mb); //FIXME avoid if allready clear (move after skip handlong?)
-if( h->slice_type == B_TYPE ) {
-av_log( h->s.avctx, AV_LOG_ERROR, "B-frame not supported with CABAC\n" );
-return -1;
-}
 if( h->sps.mb_aff ) {
 av_log( h->s.avctx, AV_LOG_ERROR, "Fields not supported with CABAC\n" );
 return -1;
 }
 if( h->slice_type != I_TYPE && h->slice_type != SI_TYPE ) {
 /* read skip flags */
 if( decode_cabac_mb_skip( h ) ) {
 int mx, my;
+//FIXME b frame
 /* skip mb */
 mb_type= MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P1L0|MB_TYPE_SKIP;
 memset(h->non_zero_count[mb_xy], 0, 16);
 memset(h->non_zero_count_cache + 8, 0, 8*5); //FIXME ugly, remove pfui
 if( ( mb_type = decode_cabac_mb_type( h ) ) < 0 ) {
 av_log( h->s.avctx, AV_LOG_ERROR, "decode_cabac_mb_type failed\n" );
 return -1;
 }
-if( h->slice_type == P_TYPE ) {
+if( h->slice_type == B_TYPE ) {
+if( mb_type < 23 ){
+partition_count= b_mb_type_info[mb_type].partition_count;
+mb_type=         b_mb_type_info[mb_type].type;
+}else{
+mb_type -= 23;
+goto decode_intra_mb;
+}
+} else if( h->slice_type == P_TYPE ) {
 if( mb_type < 5) {
 partition_count= p_mb_type_info[mb_type].partition_count;
 mb_type=         p_mb_type_info[mb_type].type;
 } else {
 mb_type -= 5;
 h->chroma_pred_mode= check_intra_pred_mode( h, h->chroma_pred_mode );
 if( h->chroma_pred_mode < 0 ) return -1;
 } else if( partition_count == 4 ) {
 int i, j, sub_partition_count[4], list, ref[2][4];
-/* Only P-frame */
+if( h->slice_type == B_TYPE ) {
 for( i = 0; i < 4; i++ ) {
-h->sub_mb_type[i] = decode_cabac_mb_sub_type( h );
+h->sub_mb_type[i] = decode_cabac_b_mb_sub_type( h );
-sub_partition_count[i]= p_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count;
+sub_partition_count[i]= b_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count;
-h->sub_mb_type[i]=      p_sub_mb_type_info[ h->sub_mb_type[i] ].type;
+h->sub_mb_type[i]=      b_sub_mb_type_info[ h->sub_mb_type[i] ].type;
+}
+} else {
+for( i = 0; i < 4; i++ ) {
+h->sub_mb_type[i] = decode_cabac_p_mb_sub_type( h );
+sub_partition_count[i]= p_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count;
+h->sub_mb_type[i]=      p_sub_mb_type_info[ h->sub_mb_type[i] ].type;
+}
 }
 for( list = 0; list < 2; list++ ) {
 if( h->ref_count[list] > 0 ) {
 for( i = 0; i < 4; i++ ) {

Mercurial > libavcodec.hg

comparison h264.c @ 2310:c5cd8a064c34 libavcodec