libavcodec.hg: h264.c comparison

comparison h264.c @ 7407:6288bc103b9f libavcodec

chroma_format_idc=0 aka grayscale support. Can be disabled by removing #define ALLOW_NOCHROMA in case the extra if() slow the code down measurably. Fixes at least FRExt/HPCAMOLQ_BRCM_B.264 FRExt/HPCVMOLQ_BRCM_B.264

author	michael
date	Sat, 26 Jul 2008 02:27:14 +0000
parents	dfe1d1d104eb
children	f25c192ce081

comparison

equal deleted inserted replaced

-:7b2819083061
+:6288bc103b9f
 }else{
 h->luma_weight[list][i]= luma_def;
 h->luma_offset[list][i]= 0;
 }
+if(CHROMA){
 chroma_weight_flag= get_bits1(&s->gb);
 if(chroma_weight_flag){
 int j;
 for(j=0; j<2; j++){
 h->chroma_weight[list][i][j]= get_se_golomb(&s->gb);
 int j;
 for(j=0; j<2; j++){
 h->chroma_weight[list][i][j]= chroma_def;
 h->chroma_offset[list][i][j]= 0;
 }
+}
 }
 }
 if(h->slice_type_nos != FF_B_TYPE) break;
 }
 h->use_weight= h->use_weight || h->use_weight_chroma;
 for(x=0; x<16; x++){
 tprintf(s->avctx, "LUMA ICPM LEVEL (%3d)\n", show_bits(&s->gb, 8));
 h->mb[index + (x&3) + 16*((x>>2)&1) + 64*(x>>3)]= get_bits(&s->gb, 8);
 }
 }
+if(CHROMA){
 for(y=0; y<8; y++){
 const int index= 256 + 4*(y&3) + 32*(y>>2);
 for(x=0; x<8; x++){
 tprintf(s->avctx, "CHROMA U ICPM LEVEL (%3d)\n", show_bits(&s->gb, 8));
 h->mb[index + (x&3) + 16*(x>>2)]= get_bits(&s->gb, 8);
 const int index= 256 + 64 + 4*(y&3) + 32*(y>>2);
 for(x=0; x<8; x++){
 tprintf(s->avctx, "CHROMA V ICPM LEVEL (%3d)\n", show_bits(&s->gb, 8));
 h->mb[index + (x&3) + 16*(x>>2)]= get_bits(&s->gb, 8);
 }
+}
 }
 // In deblocking, the quantizer is 0
 s->current_picture.qscale_table[mb_xy]= 0;
 // All coeffs are present
 }else{
 h->intra16x16_pred_mode= check_intra_pred_mode(h, h->intra16x16_pred_mode);
 if(h->intra16x16_pred_mode < 0)
 return -1;
 }
+if(CHROMA){
 pred_mode= check_intra_pred_mode(h, get_ue_golomb(&s->gb));
 if(pred_mode < 0)
 return -1;
 h->chroma_pred_mode= pred_mode;
+}
 }else if(partition_count==4){
 int i, j, sub_partition_count[4], list, ref[2][4];
 if(h->slice_type_nos == FF_B_TYPE){
 for(i=0; i<4; i++){
 if(cbp > 47){
 av_log(h->s.avctx, AV_LOG_ERROR, "cbp too large (%u) at %d %d\n", cbp, s->mb_x, s->mb_y);
 return -1;
 }
+if(CHROMA){
 if(IS_INTRA4x4(mb_type))
 cbp= golomb_to_intra4x4_cbp[cbp];
 else
 cbp= golomb_to_inter_cbp[cbp];
+}else{
+if(IS_INTRA4x4(mb_type)) cbp= golomb_to_intra4x4_cbp_gray[cbp];
+else                     cbp= golomb_to_inter_cbp_gray[cbp];
+}
 }
 h->cbp = cbp;
 if(dct8x8_allowed && (cbp&15) && !IS_INTRA(mb_type)){
 if(get_bits1(&s->gb)){
 for(x=0; x<16; x++){
 tprintf(s->avctx, "LUMA ICPM LEVEL (%3d)\n", *ptr);
 h->mb[index + (x&3) + 16*((x>>2)&1) + 64*(x>>3)]= *ptr++;
 }
 }
+if(CHROMA){
 for(y=0; y<8; y++){
 const int index= 256 + 4*(y&3) + 32*(y>>2);
 for(x=0; x<8; x++){
 tprintf(s->avctx, "CHROMA U ICPM LEVEL (%3d)\n", *ptr);
 h->mb[index + (x&3) + 16*(x>>2)]= *ptr++;
 const int index= 256 + 64 + 4*(y&3) + 32*(y>>2);
 for(x=0; x<8; x++){
 tprintf(s->avctx, "CHROMA V ICPM LEVEL (%3d)\n", *ptr);
 h->mb[index + (x&3) + 16*(x>>2)]= *ptr++;
 }
+}
 }
 ff_init_cabac_decoder(&h->cabac, ptr, h->cabac.bytestream_end - ptr);
 // All blocks are present
 if( check_intra4x4_pred_mode(h) < 0 ) return -1;
 } else {
 h->intra16x16_pred_mode= check_intra_pred_mode( h, h->intra16x16_pred_mode );
 if( h->intra16x16_pred_mode < 0 ) return -1;
 }
+if(CHROMA){
 h->chroma_pred_mode_table[mb_xy] =
 pred_mode                        = decode_cabac_mb_chroma_pre_mode( h );
 pred_mode= check_intra_pred_mode( h, pred_mode );
 if( pred_mode < 0 ) return -1;
 h->chroma_pred_mode= pred_mode;
+}
 } else if( partition_count == 4 ) {
 int i, j, sub_partition_count[4], list, ref[2][4];
 if( h->slice_type_nos == FF_B_TYPE ) {
 for( i = 0; i < 4; i++ ) {
 write_back_motion( h, mb_type );
 }
 if( !IS_INTRA16x16( mb_type ) ) {
 cbp  = decode_cabac_mb_cbp_luma( h );
+if(CHROMA)
 cbp |= decode_cabac_mb_cbp_chroma( h ) << 4;
 }
 h->cbp_table[mb_xy] = h->cbp = cbp;
 sps->profile_idc= profile_idc;
 sps->level_idc= level_idc;
 if(sps->profile_idc >= 100){ //high profile
-if(get_ue_golomb(&s->gb) == 3) //chroma_format_idc
+sps->chroma_format_idc= get_ue_golomb(&s->gb);
+if(sps->chroma_format_idc == 3)
 get_bits1(&s->gb);  //residual_color_transform_flag
 get_ue_golomb(&s->gb);  //bit_depth_luma_minus8
 get_ue_golomb(&s->gb);  //bit_depth_chroma_minus8
 sps->transform_bypass = get_bits1(&s->gb);
 decode_scaling_matrices(h, sps, NULL, 1, sps->scaling_matrix4, sps->scaling_matrix8);
-}else
+}else{
 sps->scaling_matrix_present = 0;
+sps->chroma_format_idc= 1;
+}
 sps->log2_max_frame_num= get_ue_golomb(&s->gb) + 4;
 sps->poc_type= get_ue_golomb(&s->gb);
 if(sps->poc_type == 0){ //FIXME #define
 sps->vui_parameters_present_flag= get_bits1(&s->gb);
 if( sps->vui_parameters_present_flag )
 decode_vui_parameters(h, sps);
 if(s->avctx->debug&FF_DEBUG_PICT_INFO){
-av_log(h->s.avctx, AV_LOG_DEBUG, "sps:%u profile:%d/%d poc:%d ref:%d %dx%d %s %s crop:%d/%d/%d/%d %s\n",
+av_log(h->s.avctx, AV_LOG_DEBUG, "sps:%u profile:%d/%d poc:%d ref:%d %dx%d %s %s crop:%d/%d/%d/%d %s %s\n",
 sps_id, sps->profile_idc, sps->level_idc,
 sps->poc_type,
 sps->ref_frame_count,
 sps->mb_width, sps->mb_height,
 sps->frame_mbs_only_flag ? "FRM" : (sps->mb_aff ? "MB-AFF" : "PIC-AFF"),
 sps->direct_8x8_inference_flag ? "8B8" : "",
 sps->crop_left, sps->crop_right,
 sps->crop_top, sps->crop_bottom,
-sps->vui_parameters_present_flag ? "VUI" : ""
+sps->vui_parameters_present_flag ? "VUI" : "",
+((const char*[]){"Gray","420","422","444"})[sps->chroma_format_idc]
 );
 }
 return 0;
 }

Mercurial > libavcodec.hg

comparison h264.c @ 7407:6288bc103b9f libavcodec