Do not recalculate constant part of is_complex for every MB.

Originally committed as revision 16172 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Michael Niedermayer 16 years ago
parent 41e4055b63
commit 89db0bae26
  1. 7
      libavcodec/h264.c
  2. 2
      libavcodec/h264.h

@ -2610,9 +2610,7 @@ static void hl_decode_mb(H264Context *h){
MpegEncContext * const s = &h->s; MpegEncContext * const s = &h->s;
const int mb_xy= h->mb_xy; const int mb_xy= h->mb_xy;
const int mb_type= s->current_picture.mb_type[mb_xy]; const int mb_type= s->current_picture.mb_type[mb_xy];
int is_complex = FRAME_MBAFF || MB_FIELD || IS_INTRA_PCM(mb_type) || s->codec_id != CODEC_ID_H264 || int is_complex = h->is_complex || IS_INTRA_PCM(mb_type) || s->qscale == 0;
(ENABLE_GRAY && (s->flags&CODEC_FLAG_GRAY)) || (ENABLE_H264_ENCODER && s->encoding) || ENABLE_SMALL ||
s->qscale == 0;
if(ENABLE_H264_ENCODER && !s->decode) if(ENABLE_H264_ENCODER && !s->decode)
return; return;
@ -6573,6 +6571,9 @@ static int decode_slice(struct AVCodecContext *avctx, void *arg){
s->mb_skip_run= -1; 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) || ENABLE_SMALL;
if( h->pps.cabac ) { if( h->pps.cabac ) {
int i; int i;

@ -491,6 +491,8 @@ typedef struct H264Context{
* pic_struct in picture timing SEI message * pic_struct in picture timing SEI message
*/ */
SEI_PicStructType sei_pic_struct; SEI_PicStructType sei_pic_struct;
int is_complex;
}H264Context; }H264Context;
#endif /* AVCODEC_H264_H */ #endif /* AVCODEC_H264_H */

Loading…
Cancel
Save