highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/magicyuvenc: remove unnecessary indirection

Browse Source
This commit is contained in:
Paul B Mahol 2023-09-10 13:14:15 +02:00
parent 8c3169fafb
commit fd1574d1ba
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/magicyuvenc.c
View File

@ -415,7 +415,7 @@ static int encode_table(AVCodecContext *avctx,
return 0; return 0;
} }
static int encode_plane_slice(const uint8_t *src, uint8_t *dst, int dst_size, static int encode_plane_slice(const uint8_t *src, uint8_t *dst, unsigned dst_size,
int width, int height, HuffEntry *he, int prediction) int width, int height, HuffEntry *he, int prediction)
{ {
PutBitContext pb; PutBitContext pb;
@ -453,17 +453,14 @@ static int encode_slice(AVCodecContext *avctx, void *tdata,
const int slice_height = s->slice_height; const int slice_height = s->slice_height;
const int last_height = FFMIN(slice_height, avctx->height - n * slice_height); const int last_height = FFMIN(slice_height, avctx->height - n * slice_height);
const int height = (n < (s->nb_slices - 1)) ? slice_height : last_height; const int height = (n < (s->nb_slices - 1)) ? slice_height : last_height;
PutByteContext pb;
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];
bytestream2_init_writer(&pb, sl->bitslice, s->bitslice_size);
sl->size = sl->size =
encode_plane_slice(sl->slice, encode_plane_slice(sl->slice,
sl->bitslice, sl->bitslice,
bytestream2_get_bytes_left_p(&pb), s->bitslice_size,
AV_CEIL_RSHIFT(avctx->width, s->hshift[i]), AV_CEIL_RSHIFT(avctx->width, s->hshift[i]),
AV_CEIL_RSHIFT(height, s->vshift[i]), AV_CEIL_RSHIFT(height, s->vshift[i]),
s->he[i], s->frame_pred); s->he[i], s->frame_pred);