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/magicyuvenc: Simplify padding slice

Browse Source 
Do it before writing the actual slice to be able to use
a single AV_WN32().

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2025-04-17 07:32:12 +02:00
parent e8b97b74dd
commit 3a90bbe4b7
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/magicyuvenc.c
View File

@ -423,14 +423,13 @@ static int encode_table(AVCodecContext *avctx,
return 0; return 0;
} }
static void encode_plane_slice_raw(const uint8_t *src, uint8_t *dst, int dst_size, static void encode_plane_slice_raw(const uint8_t *src, uint8_t *dst,
int width, int height, int prediction) int width, int height, int prediction)
{ {
unsigned count = width * height; unsigned count = width * height;
dst[0] = 1; dst[0] = 1;
dst[1] = prediction; dst[1] = prediction;
AV_WN32(dst + dst_size - 4, 0);
memcpy(dst + 2, src, count); memcpy(dst + 2, src, count);
} }
@ -439,7 +438,6 @@ static void encode_plane_slice(const uint8_t *src, uint8_t *dst, unsigned dst_si
int width, int height, HuffEntry *he, int prediction) int width, int height, HuffEntry *he, int prediction)
{ {
PutBitContext pb; PutBitContext pb;
int count;
init_put_bits(&pb, dst, dst_size); init_put_bits(&pb, dst, dst_size);
@ -456,13 +454,8 @@ static void encode_plane_slice(const uint8_t *src, uint8_t *dst, unsigned dst_si
src += width; src += width;
} }
count = put_bits_count(&pb) & 0x1F;
if (count)
put_bits(&pb, 32 - count, 0);
flush_put_bits(&pb); flush_put_bits(&pb);
av_assert1(put_bytes_left(&pb, 0) == 0); av_assert1(put_bytes_left(&pb, 0) <= 3);
} }
static int encode_slice(AVCodecContext *avctx, void *tdata, static int encode_slice(AVCodecContext *avctx, void *tdata,
@ -473,8 +466,11 @@ static int encode_slice(AVCodecContext *avctx, void *tdata,
for (int i = 0; i < s->planes; i++) { for (int i = 0; i < s->planes; i++) {
Slice *sl = &s->slices[n * s->planes + i]; Slice *sl = &s->slices[n * s->planes + i];
// Zero the padding now
AV_WN32(sl->dst + sl->size - 4, 0);
if (sl->encode_raw) if (sl->encode_raw)
encode_plane_slice_raw(sl->slice, sl->dst, sl->size, encode_plane_slice_raw(sl->slice, sl->dst,
sl->width, sl->height, s->frame_pred); sl->width, sl->height, s->frame_pred);
else else
encode_plane_slice(sl->slice, encode_plane_slice(sl->slice,