diff options
Diffstat (limited to 'libavcodec/svq3.c')
-rw-r--r-- | libavcodec/svq3.c | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index 98260ad..e81bfd4 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -419,10 +419,10 @@ static int svq3_decode_mb (H264Context *h, unsigned int mb_type) { h->topright_samples_available = 0xFFFF; if (mb_type == 0) { /* SKIP */ - if (s->pict_type == P_TYPE || s->next_picture.mb_type[mb_xy] == -1) { + if (s->pict_type == FF_P_TYPE || s->next_picture.mb_type[mb_xy] == -1) { svq3_mc_dir_part (s, 16*s->mb_x, 16*s->mb_y, 16, 16, 0, 0, 0, 0, 0, 0); - if (s->pict_type == B_TYPE) { + if (s->pict_type == FF_B_TYPE) { svq3_mc_dir_part (s, 16*s->mb_x, 16*s->mb_y, 16, 16, 0, 0, 0, 0, 1, 1); } @@ -483,15 +483,15 @@ static int svq3_decode_mb (H264Context *h, unsigned int mb_type) { }else memset (&h->ref_cache[m][scan8[0] - 1*8 - 1], PART_NOT_AVAILABLE, 8); - if (s->pict_type != B_TYPE) + if (s->pict_type != FF_B_TYPE) break; } /* decode motion vector(s) and form prediction(s) */ - if (s->pict_type == P_TYPE) { + if (s->pict_type == FF_P_TYPE) { if(svq3_mc_dir (h, (mb_type - 1), mode, 0, 0) < 0) return -1; - } else { /* B_TYPE */ + } else { /* FF_B_TYPE */ if (mb_type != 2) { if(svq3_mc_dir (h, 0, mode, 0, 0) < 0) return -1; @@ -590,11 +590,11 @@ static int svq3_decode_mb (H264Context *h, unsigned int mb_type) { mb_type = MB_TYPE_INTRA16x16; } - if (!IS_INTER(mb_type) && s->pict_type != I_TYPE) { + if (!IS_INTER(mb_type) && s->pict_type != FF_I_TYPE) { for (i=0; i < 4; i++) { memset (s->current_picture.motion_val[0][b_xy + i*h->b_stride], 0, 4*2*sizeof(int16_t)); } - if (s->pict_type == B_TYPE) { + if (s->pict_type == FF_B_TYPE) { for (i=0; i < 4; i++) { memset (s->current_picture.motion_val[1][b_xy + i*h->b_stride], 0, 4*2*sizeof(int16_t)); } @@ -603,12 +603,12 @@ static int svq3_decode_mb (H264Context *h, unsigned int mb_type) { if (!IS_INTRA4x4(mb_type)) { memset (h->intra4x4_pred_mode[mb_xy], DC_PRED, 8); } - if (!IS_SKIP(mb_type) || s->pict_type == B_TYPE) { + if (!IS_SKIP(mb_type) || s->pict_type == FF_B_TYPE) { memset (h->non_zero_count_cache + 8, 0, 4*9*sizeof(uint8_t)); s->dsp.clear_blocks(h->mb); } - if (!IS_INTRA16x16(mb_type) && (!IS_SKIP(mb_type) || s->pict_type == B_TYPE)) { + if (!IS_INTRA16x16(mb_type) && (!IS_SKIP(mb_type) || s->pict_type == FF_B_TYPE)) { if ((vlc = svq3_get_ue_golomb (&s->gb)) >= 48){ av_log(h->s.avctx, AV_LOG_ERROR, "cbp_vlc=%d\n", vlc); return -1; @@ -616,7 +616,7 @@ static int svq3_decode_mb (H264Context *h, unsigned int mb_type) { cbp = IS_INTRA(mb_type) ? golomb_to_intra4x4_cbp[vlc] : golomb_to_inter_cbp[vlc]; } - if (IS_INTRA16x16(mb_type) || (s->pict_type != I_TYPE && s->adaptive_quant && cbp)) { + if (IS_INTRA16x16(mb_type) || (s->pict_type != FF_I_TYPE && s->adaptive_quant && cbp)) { s->qscale += svq3_get_se_golomb (&s->gb); if (s->qscale > 31){ @@ -859,21 +859,21 @@ static int svq3_decode_frame (AVCodecContext *avctx, /* for hurry_up==5 */ s->current_picture.pict_type = s->pict_type; - s->current_picture.key_frame = (s->pict_type == I_TYPE); + s->current_picture.key_frame = (s->pict_type == FF_I_TYPE); /* Skip B-frames if we do not have reference frames. */ - if (s->last_picture_ptr == NULL && s->pict_type == B_TYPE) return 0; + if (s->last_picture_ptr == NULL && s->pict_type == FF_B_TYPE) return 0; /* Skip B-frames if we are in a hurry. */ - if (avctx->hurry_up && s->pict_type == B_TYPE) return 0; + if (avctx->hurry_up && s->pict_type == FF_B_TYPE) return 0; /* Skip everything if we are in a hurry >= 5. */ if (avctx->hurry_up >= 5) return 0; - if( (avctx->skip_frame >= AVDISCARD_NONREF && s->pict_type==B_TYPE) - ||(avctx->skip_frame >= AVDISCARD_NONKEY && s->pict_type!=I_TYPE) + if( (avctx->skip_frame >= AVDISCARD_NONREF && s->pict_type==FF_B_TYPE) + ||(avctx->skip_frame >= AVDISCARD_NONKEY && s->pict_type!=FF_I_TYPE) || avctx->skip_frame >= AVDISCARD_ALL) return 0; if (s->next_p_frame_damaged) { - if (s->pict_type == B_TYPE) + if (s->pict_type == FF_B_TYPE) return 0; else s->next_p_frame_damaged = 0; @@ -882,7 +882,7 @@ static int svq3_decode_frame (AVCodecContext *avctx, if (frame_start (h) < 0) return -1; - if (s->pict_type == B_TYPE) { + if (s->pict_type == FF_B_TYPE) { h->frame_num_offset = (h->slice_num - h->prev_frame_num); if (h->frame_num_offset < 0) { @@ -930,9 +930,9 @@ static int svq3_decode_frame (AVCodecContext *avctx, mb_type = svq3_get_ue_golomb (&s->gb); - if (s->pict_type == I_TYPE) { + if (s->pict_type == FF_I_TYPE) { mb_type += 8; - } else if (s->pict_type == B_TYPE && mb_type >= 4) { + } else if (s->pict_type == FF_B_TYPE && mb_type >= 4) { mb_type += 4; } if (mb_type > 33 || svq3_decode_mb (h, mb_type)) { @@ -944,9 +944,9 @@ static int svq3_decode_frame (AVCodecContext *avctx, hl_decode_mb (h); } - if (s->pict_type != B_TYPE && !s->low_delay) { + if (s->pict_type != FF_B_TYPE && !s->low_delay) { s->current_picture.mb_type[s->mb_x + s->mb_y*s->mb_stride] = - (s->pict_type == P_TYPE && mb_type < 8) ? (mb_type - 1) : -1; + (s->pict_type == FF_P_TYPE && mb_type < 8) ? (mb_type - 1) : -1; } } @@ -955,7 +955,7 @@ static int svq3_decode_frame (AVCodecContext *avctx, MPV_frame_end(s); - if (s->pict_type == B_TYPE || s->low_delay) { + if (s->pict_type == FF_B_TYPE || s->low_delay) { *(AVFrame *) data = *(AVFrame *) &s->current_picture; } else { *(AVFrame *) data = *(AVFrame *) &s->last_picture; |