virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

avcodec/mpegvideo_enc: Pass data_partitioning directly

Browse Source 
This avoids having to store it in the backup MPVEncContext.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2025-03-25 16:03:38 +01:00
parent 1422f0057c
commit f8360ed629
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/mpegvideo_enc.c
View File

@ -2660,7 +2660,8 @@ static inline void copy_context_before_encode(MPVEncContext *const d,
} }
static inline void copy_context_after_encode(MPVEncContext *const d, static inline void copy_context_after_encode(MPVEncContext *const d,
const MPVEncContext *const s) const MPVEncContext *const s,
int data_partitioning)
{ {
int i; int i;
@ -2684,7 +2685,7 @@ static inline void copy_context_after_encode(MPVEncContext *const d,
d->c.mv_type = s->c.mv_type; d->c.mv_type = s->c.mv_type;
d->c.mv_dir = s->c.mv_dir; d->c.mv_dir = s->c.mv_dir;
d->pb= s->pb; d->pb= s->pb;
if (s->c.data_partitioning) { if (data_partitioning) {
d->pb2= s->pb2; d->pb2= s->pb2;
d->tex_pb= s->tex_pb; d->tex_pb= s->tex_pb;
} }
@ -2744,7 +2745,7 @@ static void encode_mb_hq(MPVEncContext *const s, MPVEncContext *const backup, MP
*dmin= score; *dmin= score;
*next_block^=1; *next_block^=1;
copy_context_after_encode(best, s); copy_context_after_encode(best, s, s->c.data_partitioning);
} }
} }
@ -3165,8 +3166,6 @@ static int encode_thread(AVCodecContext *c, void *arg){
copy_context_before_encode(&backup_s, s); copy_context_before_encode(&backup_s, s);
backup_s.pb= s->pb; backup_s.pb= s->pb;
best_s.c.data_partitioning = s->c.data_partitioning;
best_s.c.partitioned_frame = s->c.partitioned_frame;
if (s->c.data_partitioning) { if (s->c.data_partitioning) {
backup_s.pb2= s->pb2; backup_s.pb2= s->pb2;
backup_s.tex_pb= s->tex_pb; backup_s.tex_pb= s->tex_pb;
@ -3390,7 +3389,7 @@ static int encode_thread(AVCodecContext *c, void *arg){
} }
} }
copy_context_after_encode(s, &best_s); copy_context_after_encode(s, &best_s, s->c.data_partitioning);
pb_bits_count= put_bits_count(&s->pb); pb_bits_count= put_bits_count(&s->pb);
flush_put_bits(&s->pb); flush_put_bits(&s->pb);