virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avcodec/mpegvideo_enc: Don't reset statistics twice

Browse Source 
This happens currently for the non-main slice contexts.
But these variables get reset at the start of encode_thread()
anyway for all slices, so this is unnecessary.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2025-03-19 12:53:44 +01:00
parent d66e9cb0d2
commit 8b15979a4b
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
libavcodec/mpegvideo_enc.c
View File

@@ -3582,6 +3582,7 @@ static int encode_thread(AVCodecContext *c, void *arg){
return 0; return 0;
} }
#define ADD(field) dst->field += src->field;
#define MERGE(field) dst->field += src->field; src->field=0 #define MERGE(field) dst->field += src->field; src->field=0
static void merge_context_after_me(MPVEncContext *const dst, MPVEncContext *const src) static void merge_context_after_me(MPVEncContext *const dst, MPVEncContext *const src)
{ {
@@ -3596,14 +3597,14 @@ static void merge_context_after_encode(MPVEncContext *const dst, MPVEncContext *
MERGE(dct_count[0]); //note, the other dct vars are not part of the context MERGE(dct_count[0]); //note, the other dct vars are not part of the context
MERGE(dct_count[1]); MERGE(dct_count[1]);
MERGE(mv_bits); ADD(mv_bits);
MERGE(i_tex_bits); ADD(i_tex_bits);
MERGE(p_tex_bits); ADD(p_tex_bits);
MERGE(i_count); ADD(i_count);
MERGE(misc_bits); ADD(misc_bits);
MERGE(encoding_error[0]); ADD(encoding_error[0]);
MERGE(encoding_error[1]); ADD(encoding_error[1]);
MERGE(encoding_error[2]); ADD(encoding_error[2]);
if (dst->dct_error_sum) { if (dst->dct_error_sum) {
for(i=0; i<64; i++){ for(i=0; i<64; i++){