diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2024-10-10 19:57:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2024-10-14 22:29:33 +0200 |
| commit | 8e52b1525831987bcc389c89ccf53a76e7177fe1 (patch) | |
| tree | 60bdb71a5a33c595377edc4eca2a353669038dbe | |
| parent | d9269fcacf32a30e502a62e60808e0eee090c588 (diff) | |
| download | ffmpeg-8e52b1525831987bcc389c89ccf53a76e7177fe1.tar.gz | |
avcodec/ffv1enc: Move slice termination into threads
Sponsored-by: Sovereign Tech Fund
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/ffv1enc.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c index 76f5cf4b25..8295ddedf4 100644 --- a/libavcodec/ffv1enc.c +++ b/libavcodec/ffv1enc.c @@ -1105,6 +1105,13 @@ retry: ret = encode_rgb_frame(f, sc, planes, width, height, p->linesize); } + if (f->ac != AC_GOLOMB_RICE) { + sc->ac_byte_count = ff_rac_terminate(&sc->c, 1); + } else { + flush_put_bits(&sc->pb); // FIXME: nicer padding + sc->ac_byte_count += put_bytes_output(&sc->pb); + } + if (ret < 0) { av_assert0(sc->slice_coding_mode == 0); if (f->version < 4 || !f->ac) { @@ -1229,14 +1236,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, buf_p = pkt->data; for (i = 0; i < f->slice_count; i++) { FFV1SliceContext *sc = &f->slices[i]; - int bytes; - - if (f->ac != AC_GOLOMB_RICE) { - bytes = ff_rac_terminate(&sc->c, 1); - } else { - flush_put_bits(&sc->pb); // FIXME: nicer padding - bytes = sc->ac_byte_count + put_bytes_output(&sc->pb); - } + int bytes = sc->ac_byte_count; if (i > 0 || f->version > 2) { av_assert0(bytes < pkt->size / f->slice_count); memmove(buf_p, sc->c.bytestream_start, bytes); |