libavcodec.hg: h264.c comparison

comparison h264.c @ 8596:68e959302527 libavcodec

replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_ and remove all ENABLE_ definitions.

author	aurel
date	Wed, 14 Jan 2009 17:19:17 +0000
parents	7a463923ecd1
children	2ca51be7dad8

comparison

equal deleted inserted replaced

-:2f476018b4ac
+:68e959302527
 qpix_op[luma_xy](dest_y, src_y, h->mb_linesize); //FIXME try variable height perhaps?
 if(!square){
 qpix_op[luma_xy](dest_y + delta, src_y + delta, h->mb_linesize);
 }
-if(ENABLE_GRAY && s->flags&CODEC_FLAG_GRAY) return;
+if(CONFIG_GRAY && s->flags&CODEC_FLAG_GRAY) return;
 if(MB_FIELD){
 // chroma offset when predicting from a field of opposite parity
 my += 2 * ((s->mb_y & 1) - (pic->reference - 1));
 emu |= (my>>3) < 0 || (my>>3) + 8 >= (pic_height>>1);
 offset  = MB_MBAFF ? 1 : 17;
 uvoffset= MB_MBAFF ? 1 : 9;
 if(!MB_MBAFF){
 *(uint64_t*)(h->top_borders[0][s->mb_x]+ 0)= *(uint64_t*)(src_y +  15*linesize);
 *(uint64_t*)(h->top_borders[0][s->mb_x]+ 8)= *(uint64_t*)(src_y +8+15*linesize);
-if(simple || !ENABLE_GRAY || !(s->flags&CODEC_FLAG_GRAY)){
+if(simple || !CONFIG_GRAY || !(s->flags&CODEC_FLAG_GRAY)){
 *(uint64_t*)(h->top_borders[0][s->mb_x]+16)= *(uint64_t*)(src_cb+7*uvlinesize);
 *(uint64_t*)(h->top_borders[0][s->mb_x]+24)= *(uint64_t*)(src_cr+7*uvlinesize);
 }
 }
 }else{
 if(!MB_MBAFF){
 h->left_border[0]= h->top_borders[0][s->mb_x][15];
-if(simple || !ENABLE_GRAY || !(s->flags&CODEC_FLAG_GRAY)){
+if(simple || !CONFIG_GRAY || !(s->flags&CODEC_FLAG_GRAY)){
 h->left_border[34   ]= h->top_borders[0][s->mb_x][16+7  ];
 h->left_border[34+18]= h->top_borders[0][s->mb_x][16+8+7];
 }
 skiplast= 1;
 }
 }
 *(uint64_t*)(h->top_borders[top_idx][s->mb_x]+0)= *(uint64_t*)(src_y +  16*linesize);
 *(uint64_t*)(h->top_borders[top_idx][s->mb_x]+8)= *(uint64_t*)(src_y +8+16*linesize);
-if(simple || !ENABLE_GRAY || !(s->flags&CODEC_FLAG_GRAY)){
+if(simple || !CONFIG_GRAY || !(s->flags&CODEC_FLAG_GRAY)){
 h->left_border[uvoffset+34   ]= h->top_borders[top_idx][s->mb_x][16+7];
 h->left_border[uvoffset+34+18]= h->top_borders[top_idx][s->mb_x][24+7];
 for(i=1; i<9 - skiplast; i++){
 h->left_border[uvoffset+34   +i*step]= src_cb[7+i*uvlinesize];
 h->left_border[uvoffset+34+18+i*step]= src_cr[7+i*uvlinesize];
 if(s->mb_x+1 < s->mb_width){
 XCHG(*(uint64_t*)(h->top_borders[top_idx][s->mb_x+1]), *(uint64_t*)(src_y +17), temp64, 1);
 }
 }
-if(simple || !ENABLE_GRAY || !(s->flags&CODEC_FLAG_GRAY)){
+if(simple || !CONFIG_GRAY || !(s->flags&CODEC_FLAG_GRAY)){
 if(deblock_left){
 for(i = !deblock_top; i<8; i++){
 XCHG(h->left_border[uvoffset+34   +i*step], src_cb[i*uvlinesize], temp8, xchg);
 XCHG(h->left_border[uvoffset+34+18+i*step], src_cr[i*uvlinesize], temp8, xchg);
 }
 int linesize, uvlinesize /*dct_offset*/;
 int i;
 int *block_offset = &h->block_offset[0];
 const int transform_bypass = !simple && (s->qscale == 0 && h->sps.transform_bypass);
 /* is_h264 should always be true if SVQ3 is disabled. */
-const int is_h264 = !ENABLE_SVQ3_DECODER || simple || s->codec_id == CODEC_ID_H264;
+const int is_h264 = !CONFIG_SVQ3_DECODER || simple || s->codec_id == CODEC_ID_H264;
 void (*idct_add)(uint8_t *dst, DCTELEM *block, int stride);
 void (*idct_dc_add)(uint8_t *dst, DCTELEM *block, int stride);
 dest_y  = s->current_picture.data[0] + (mb_x + mb_y * s->linesize  ) * 16;
 dest_cb = s->current_picture.data[1] + (mb_x + mb_y * s->uvlinesize) * 8;
 } else {
 if(IS_INTRA(mb_type)){
 if(h->deblocking_filter)
 xchg_mb_border(h, dest_y, dest_cb, dest_cr, linesize, uvlinesize, 1, simple);
-if(simple || !ENABLE_GRAY || !(s->flags&CODEC_FLAG_GRAY)){
+if(simple || !CONFIG_GRAY || !(s->flags&CODEC_FLAG_GRAY)){
 h->hpc.pred8x8[ h->chroma_pred_mode ](dest_cb, uvlinesize);
 h->hpc.pred8x8[ h->chroma_pred_mode ](dest_cr, uvlinesize);
 }
 if(IS_INTRA4x4(mb_type)){
 }
 }
 }
 }
-if((simple || !ENABLE_GRAY || !(s->flags&CODEC_FLAG_GRAY)) && (h->cbp&0x30)){
+if((simple || !CONFIG_GRAY || !(s->flags&CODEC_FLAG_GRAY)) && (h->cbp&0x30)){
 uint8_t *dest[2] = {dest_cb, dest_cr};
 if(transform_bypass){
 if(IS_INTRA(mb_type) && h->sps.profile_idc==244 && (h->chroma_pred_mode==VERT_PRED8x8 || h->chroma_pred_mode==HOR_PRED8x8)){
 h->hpc.pred8x8_add[h->chroma_pred_mode](dest[0], block_offset + 16, h->mb + 16*16, uvlinesize);
 h->hpc.pred8x8_add[h->chroma_pred_mode](dest[1], block_offset + 20, h->mb + 20*16, uvlinesize);
 static void hl_decode_mb(H264Context *h){
 MpegEncContext * const s = &h->s;
 const int mb_xy= h->mb_xy;
 const int mb_type= s->current_picture.mb_type[mb_xy];
-int is_complex = ENABLE_SMALL || h->is_complex || IS_INTRA_PCM(mb_type) || s->qscale == 0;
+int is_complex = CONFIG_SMALL || h->is_complex || IS_INTRA_PCM(mb_type) || s->qscale == 0;
-if(ENABLE_H264_ENCODER && !s->decode)
+if(CONFIG_H264_ENCODER && !s->decode)
 return;
 if (is_complex)
 hl_decode_mb_complex(h);
 else hl_decode_mb_simple(h);
 const int part_mask= s->partitioned_frame ? (AC_END|AC_ERROR) : 0x7F;
 s->mb_skip_run= -1;
 h->is_complex = FRAME_MBAFF || s->picture_structure != PICT_FRAME || s->codec_id != CODEC_ID_H264 ||
-(ENABLE_GRAY && (s->flags&CODEC_FLAG_GRAY)) || (ENABLE_H264_ENCODER && s->encoding);
+(CONFIG_GRAY && (s->flags&CODEC_FLAG_GRAY)) || (CONFIG_H264_ENCODER && s->encoding);
 if( h->pps.cabac ) {
 int i;
 /* realign */
 if(hx->redundant_pic_count==0 && hx->s.hurry_up < 5
 && (avctx->skip_frame < AVDISCARD_NONREF || hx->nal_ref_idc)
 && (avctx->skip_frame < AVDISCARD_BIDIR  || hx->slice_type_nos!=FF_B_TYPE)
 && (avctx->skip_frame < AVDISCARD_NONKEY || hx->slice_type_nos==FF_I_TYPE)
 && avctx->skip_frame < AVDISCARD_ALL){
-if(ENABLE_H264_VDPAU_DECODER && avctx->codec_id == CODEC_ID_H264_VDPAU){
+if(CONFIG_H264_VDPAU_DECODER && avctx->codec_id == CODEC_ID_H264_VDPAU){
 static const uint8_t start_code[] = {0x00, 0x00, 0x01};
 ff_vdpau_add_data_chunk(s, start_code, sizeof(start_code));
 ff_vdpau_add_data_chunk(s, &buf[buf_index - consumed], consumed );
 }else
 context_count++;
 s->mb_y= 0;
 s->current_picture_ptr->qscale_type= FF_QSCALE_TYPE_H264;
 s->current_picture_ptr->pict_type= s->pict_type;
-if (ENABLE_H264_VDPAU_DECODER && avctx->codec_id == CODEC_ID_H264_VDPAU)
+if (CONFIG_H264_VDPAU_DECODER && avctx->codec_id == CODEC_ID_H264_VDPAU)
 ff_vdpau_h264_set_reference_frames(s);
 if(!s->dropable) {
 execute_ref_pic_marking(h, h->mmco, h->mmco_index);
 h->prev_poc_msb= h->poc_msb;
 h->prev_poc_lsb= h->poc_lsb;
 }
 h->prev_frame_num_offset= h->frame_num_offset;
 h->prev_frame_num= h->frame_num;
-if (ENABLE_H264_VDPAU_DECODER && avctx->codec_id == CODEC_ID_H264_VDPAU)
+if (CONFIG_H264_VDPAU_DECODER && avctx->codec_id == CODEC_ID_H264_VDPAU)
 ff_vdpau_h264_picture_complete(s);
 /*
 * FIXME: Error handling code does not seem to support interlaced
 * when slices span multiple rows

Mercurial > libavcodec.hg

comparison h264.c @ 8596:68e959302527 libavcodec