X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=libavcodec%2Fmpegvideo_enc.c;h=87531d7cd9fbb0706ab81b076b7bddadaace65c5;hb=78dc4cb26d5a4070a719c085a9d35451711b0b38;hp=ef9e0f398d8eb9114d3eac6d36ba36f2e853b58d;hpb=8ab97a60ef949f9f2cc0de768143c3ce89a1aabf;p=ffmpeg diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index ef9e0f398d8..87531d7cd9f 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -183,9 +183,8 @@ void ff_init_qscale_tab(MpegEncContext *s) } } -static void copy_picture_attributes(MpegEncContext *s, - AVFrame *dst, - AVFrame *src) +static void copy_picture_attributes(MpegEncContext *s, AVFrame *dst, + const AVFrame *src) { int i; @@ -1006,18 +1005,18 @@ static int get_intra_count(MpegEncContext *s, uint8_t *src, } -static int load_input_picture(MpegEncContext *s, AVFrame *pic_arg) +static int load_input_picture(MpegEncContext *s, const AVFrame *pic_arg) { AVFrame *pic = NULL; int64_t pts; - int i; + int i, display_picture_number = 0; const int encoding_delay = s->max_b_frames ? s->max_b_frames : (s->low_delay ? 0 : 1); int direct = 1; if (pic_arg) { pts = pic_arg->pts; - pic_arg->display_picture_number = s->input_picture_number++; + display_picture_number = s->input_picture_number++; if (pts != AV_NOPTS_VALUE) { if (s->user_specified_pts != AV_NOPTS_VALUE) { @@ -1031,7 +1030,7 @@ static int load_input_picture(MpegEncContext *s, AVFrame *pic_arg) return -1; } - if (!s->low_delay && pic_arg->display_picture_number == 1) + if (!s->low_delay && display_picture_number == 1) s->dts_delta = time - last; } s->user_specified_pts = pts; @@ -1043,91 +1042,94 @@ static int load_input_picture(MpegEncContext *s, AVFrame *pic_arg) "Warning: AVFrame.pts=? trying to guess (%"PRId64")\n", pts); } else { - pts = pic_arg->display_picture_number; + pts = display_picture_number; } } } - if (pic_arg) { - if (encoding_delay && !(s->flags & CODEC_FLAG_INPUT_PRESERVED)) - direct = 0; - if (pic_arg->linesize[0] != s->linesize) - direct = 0; - if (pic_arg->linesize[1] != s->uvlinesize) - direct = 0; - if (pic_arg->linesize[2] != s->uvlinesize) - direct = 0; - - av_dlog(s->avctx, "%d %d %d %d\n", pic_arg->linesize[0], - pic_arg->linesize[1], s->linesize, s->uvlinesize); - - if (direct) { - i = ff_find_unused_picture(s, 1); - if (i < 0) - return i; + if (pic_arg) { + if (encoding_delay && !(s->flags & CODEC_FLAG_INPUT_PRESERVED)) + direct = 0; + if (pic_arg->linesize[0] != s->linesize) + direct = 0; + if (pic_arg->linesize[1] != s->uvlinesize) + direct = 0; + if (pic_arg->linesize[2] != s->uvlinesize) + direct = 0; + + av_dlog(s->avctx, "%d %d %d %d\n", pic_arg->linesize[0], + pic_arg->linesize[1], s->linesize, s->uvlinesize); + + if (direct) { + i = ff_find_unused_picture(s, 1); + if (i < 0) + return i; - pic = &s->picture[i].f; - pic->reference = 3; + pic = &s->picture[i].f; + pic->reference = 3; - for (i = 0; i < 4; i++) { - pic->data[i] = pic_arg->data[i]; - pic->linesize[i] = pic_arg->linesize[i]; - } - if (ff_alloc_picture(s, (Picture *) pic, 1) < 0) { - return -1; - } - } else { - i = ff_find_unused_picture(s, 0); - if (i < 0) - return i; + for (i = 0; i < 4; i++) { + pic->data[i] = pic_arg->data[i]; + pic->linesize[i] = pic_arg->linesize[i]; + } + if (ff_alloc_picture(s, (Picture *) pic, 1) < 0) { + return -1; + } + } else { + i = ff_find_unused_picture(s, 0); + if (i < 0) + return i; - pic = &s->picture[i].f; - pic->reference = 3; + pic = &s->picture[i].f; + pic->reference = 3; - if (ff_alloc_picture(s, (Picture *) pic, 0) < 0) { - return -1; - } + if (ff_alloc_picture(s, (Picture *) pic, 0) < 0) { + return -1; + } - if (pic->data[0] + INPLACE_OFFSET == pic_arg->data[0] && - pic->data[1] + INPLACE_OFFSET == pic_arg->data[1] && - pic->data[2] + INPLACE_OFFSET == pic_arg->data[2]) { - // empty - } else { - int h_chroma_shift, v_chroma_shift; - avcodec_get_chroma_sub_sample(s->avctx->pix_fmt, &h_chroma_shift, &v_chroma_shift); - - for (i = 0; i < 3; i++) { - int src_stride = pic_arg->linesize[i]; - int dst_stride = i ? s->uvlinesize : s->linesize; - int h_shift = i ? h_chroma_shift : 0; - int v_shift = i ? v_chroma_shift : 0; - int w = s->width >> h_shift; - int h = s->height >> v_shift; - uint8_t *src = pic_arg->data[i]; - uint8_t *dst = pic->data[i]; - - if(s->codec_id == AV_CODEC_ID_AMV && !(s->avctx->flags & CODEC_FLAG_EMU_EDGE)){ - h= ((s->height+15)/16*16)>>v_shift; - } + if (pic->data[0] + INPLACE_OFFSET == pic_arg->data[0] && + pic->data[1] + INPLACE_OFFSET == pic_arg->data[1] && + pic->data[2] + INPLACE_OFFSET == pic_arg->data[2]) { + // empty + } else { + int h_chroma_shift, v_chroma_shift; + av_pix_fmt_get_chroma_sub_sample(s->avctx->pix_fmt, + &h_chroma_shift, + &v_chroma_shift); + + for (i = 0; i < 3; i++) { + int src_stride = pic_arg->linesize[i]; + int dst_stride = i ? s->uvlinesize : s->linesize; + int h_shift = i ? h_chroma_shift : 0; + int v_shift = i ? v_chroma_shift : 0; + int w = s->width >> h_shift; + int h = s->height >> v_shift; + uint8_t *src = pic_arg->data[i]; + uint8_t *dst = pic->data[i]; + + if (s->codec_id == AV_CODEC_ID_AMV && !(s->avctx->flags & CODEC_FLAG_EMU_EDGE)) { + h = ((s->height + 15)/16*16) >> v_shift; + } - if (!s->avctx->rc_buffer_size) - dst += INPLACE_OFFSET; + if (!s->avctx->rc_buffer_size) + dst += INPLACE_OFFSET; - if (src_stride == dst_stride) - memcpy(dst, src, src_stride * h); - else { - while (h--) { - memcpy(dst, src, w); - dst += dst_stride; - src += src_stride; + if (src_stride == dst_stride) + memcpy(dst, src, src_stride * h); + else { + while (h--) { + memcpy(dst, src, w); + dst += dst_stride; + src += src_stride; + } } } } } + copy_picture_attributes(s, pic, pic_arg); + pic->display_picture_number = display_picture_number; + pic->pts = pts; // we set this here to avoid modifiying pic_arg } - copy_picture_attributes(s, pic, pic_arg); - pic->pts = pts; // we set this here to avoid modifiying pic_arg - } /* shift buffer entries */ for (i = 1; i < MAX_PICTURE_COUNT /*s->encoding_delay + 1*/; i++) @@ -2842,6 +2844,7 @@ static int encode_thread(AVCodecContext *c, void *arg){ int16_t ac[6][16]; const int mvdir= (best_s.mv_dir&MV_DIR_BACKWARD) ? 1 : 0; static const int dquant_tab[4]={-1,1,-2,2}; + int storecoefs = s->mb_intra && s->dc_val[0]; av_assert2(backup_s.dquant == 0); @@ -2861,7 +2864,7 @@ static int encode_thread(AVCodecContext *c, void *arg){ if(qp < s->avctx->qmin || qp > s->avctx->qmax) continue; backup_s.dquant= dquant; - if(s->mb_intra && s->dc_val[0]){ + if(storecoefs){ for(i=0; i<6; i++){ dc[i]= s->dc_val[0][ s->block_index[i] ]; memcpy(ac[i], s->ac_val[0][s->block_index[i]], sizeof(int16_t)*16); @@ -2871,7 +2874,7 @@ static int encode_thread(AVCodecContext *c, void *arg){ encode_mb_hq(s, &backup_s, &best_s, CANDIDATE_MB_TYPE_INTER /* wrong but unused */, pb, pb2, tex_pb, &dmin, &next_block, s->mv[mvdir][0][0], s->mv[mvdir][0][1]); if(best_s.qscale != qp){ - if(s->mb_intra && s->dc_val[0]){ + if(storecoefs){ for(i=0; i<6; i++){ s->dc_val[0][ s->block_index[i] ]= dc[i]; memcpy(s->ac_val[0][s->block_index[i]], ac[i], sizeof(int16_t)*16);