diff options
author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-03 09:52:39 +0200 |
---|---|---|
committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-03 09:52:39 +0200 |
commit | 5fa5e73e81f191be0c4761bb4c517fdd39aff82e (patch) | |
tree | 139e9170b7999ffe132e33a2a3b782d2d99c07f4 /libavcodec | |
parent | 59b55619b6edef363532825c4cf16ac2bfdd21a1 (diff) | |
parent | 1aa24df74c052a73175c43e57d35b4835e537ec8 (diff) |
Merge commit '1aa24df74c052a73175c43e57d35b4835e537ec8'
* commit '1aa24df74c052a73175c43e57d35b4835e537ec8':
lavu: Deprecate AVFrame.error[]
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/mpegpicture.c | 3 | ||||
-rw-r--r-- | libavcodec/mpegpicture.h | 2 | ||||
-rw-r--r-- | libavcodec/mpegvideo_enc.c | 28 | ||||
-rw-r--r-- | libavcodec/snow.h | 1 | ||||
-rw-r--r-- | libavcodec/snowenc.c | 10 |
5 files changed, 29 insertions, 15 deletions
diff --git a/libavcodec/mpegpicture.c b/libavcodec/mpegpicture.c index bb822b6c09..16b8f52fa7 100644 --- a/libavcodec/mpegpicture.c +++ b/libavcodec/mpegpicture.c @@ -387,6 +387,9 @@ int ff_mpeg_ref_picture(AVCodecContext *avctx, Picture *dst, Picture *src) dst->reference = src->reference; dst->shared = src->shared; + memcpy(dst->encoding_error, src->encoding_error, + sizeof(dst->encoding_error)); + return 0; fail: ff_mpeg_unref_picture(avctx, dst); diff --git a/libavcodec/mpegpicture.h b/libavcodec/mpegpicture.h index 0a48d690c4..2db3d6733a 100644 --- a/libavcodec/mpegpicture.h +++ b/libavcodec/mpegpicture.h @@ -87,7 +87,7 @@ typedef struct Picture { int reference; int shared; - uint64_t error[AV_NUM_DATA_POINTERS]; + uint64_t encoding_error[AV_NUM_DATA_POINTERS]; } Picture; /** diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index b604a079d5..8e565c12a7 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1651,6 +1651,12 @@ FF_DISABLE_DEPRECATION_WARNINGS av_frame_copy_props(s->avctx->coded_frame, s->current_picture.f); FF_ENABLE_DEPRECATION_WARNINGS #endif +#if FF_API_ERROR_FRAME +FF_DISABLE_DEPRECATION_WARNINGS + memcpy(s->current_picture.f->error, s->current_picture.encoding_error, + sizeof(s->current_picture.encoding_error)); +FF_ENABLE_DEPRECATION_WARNINGS +#endif } static void update_noise_reduction(MpegEncContext *s) @@ -1865,13 +1871,11 @@ vbv_retry: ff_write_pass1_stats(s); for (i = 0; i < 4; i++) { - s->current_picture_ptr->f->error[i] = - s->current_picture.f->error[i] = - s->current_picture.error[i]; - avctx->error[i] += s->current_picture_ptr->f->error[i]; + s->current_picture_ptr->encoding_error[i] = s->current_picture.encoding_error[i]; + avctx->error[i] += s->current_picture_ptr->encoding_error[i]; } ff_side_data_set_encoder_stats(pkt, s->current_picture.f->quality, - s->current_picture_ptr->f->error, + s->current_picture_ptr->encoding_error, (s->avctx->flags&AV_CODEC_FLAG_PSNR) ? 4 : 0, s->pict_type); @@ -2838,7 +2842,7 @@ static int encode_thread(AVCodecContext *c, void *arg){ /* note: quant matrix value (8) is implied here */ s->last_dc[i] = 128 << s->intra_dc_precision; - s->current_picture.error[i] = 0; + s->current_picture.encoding_error[i] = 0; } if(s->codec_id==AV_CODEC_ID_AMV){ s->last_dc[0] = 128*8/13; @@ -3408,13 +3412,13 @@ static int encode_thread(AVCodecContext *c, void *arg){ if(s->mb_x*16 + 16 > s->width ) w= s->width - s->mb_x*16; if(s->mb_y*16 + 16 > s->height) h= s->height- s->mb_y*16; - s->current_picture.error[0] += sse( + s->current_picture.encoding_error[0] += sse( s, s->new_picture.f->data[0] + s->mb_x*16 + s->mb_y*s->linesize*16, s->dest[0], w, h, s->linesize); - s->current_picture.error[1] += sse( + s->current_picture.encoding_error[1] += sse( s, s->new_picture.f->data[1] + s->mb_x*8 + s->mb_y*s->uvlinesize*chr_h, s->dest[1], w>>1, h>>s->chroma_y_shift, s->uvlinesize); - s->current_picture.error[2] += sse( + s->current_picture.encoding_error[2] += sse( s, s->new_picture.f->data[2] + s->mb_x*8 + s->mb_y*s->uvlinesize*chr_h, s->dest[2], w>>1, h>>s->chroma_y_shift, s->uvlinesize); } @@ -3467,9 +3471,9 @@ static void merge_context_after_encode(MpegEncContext *dst, MpegEncContext *src) MERGE(misc_bits); MERGE(er.error_count); MERGE(padding_bug_score); - MERGE(current_picture.error[0]); - MERGE(current_picture.error[1]); - MERGE(current_picture.error[2]); + MERGE(current_picture.encoding_error[0]); + MERGE(current_picture.encoding_error[1]); + MERGE(current_picture.encoding_error[2]); if(dst->avctx->noise_reduction){ for(i=0; i<64; i++){ diff --git a/libavcodec/snow.h b/libavcodec/snow.h index a794da66b5..f2587fd6ef 100644 --- a/libavcodec/snow.h +++ b/libavcodec/snow.h @@ -185,6 +185,7 @@ typedef struct SnowContext{ AVMotionVector *avmv; int avmv_index; + uint64_t encoding_error[AV_NUM_DATA_POINTERS]; }SnowContext; /* Tables */ diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c index 1f22ad55d1..7e8269cd92 100644 --- a/libavcodec/snowenc.c +++ b/libavcodec/snowenc.c @@ -1837,7 +1837,7 @@ redo_frame: } } s->avctx->error[plane_index] += error; - s->current_picture->error[plane_index] = error; + s->encoding_error[plane_index] = error; } } @@ -1869,10 +1869,16 @@ redo_frame: emms_c(); ff_side_data_set_encoder_stats(pkt, s->current_picture->quality, - s->current_picture->error, + s->encoding_error, (s->avctx->flags&AV_CODEC_FLAG_PSNR) ? 4 : 0, s->current_picture->pict_type); +#if FF_API_ERROR_FRAME +FF_DISABLE_DEPRECATION_WARNINGS + memcpy(s->current_picture->error, s->encoding_error, sizeof(s->encoding_error)); +FF_ENABLE_DEPRECATION_WARNINGS +#endif + pkt->size = ff_rac_terminate(c); if (s->current_picture->key_frame) pkt->flags |= AV_PKT_FLAG_KEY; |