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: Only keep in Slice what is used

Browse Source 
Namely the number of counts.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2025-04-17 05:48:47 +02:00
parent a6c2c463c7
commit 4e0a29d2f6
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/magicyuvenc.c
View File

@ -58,7 +58,7 @@ typedef struct Slice {
unsigned size; unsigned size;
uint8_t *slice; uint8_t *slice;
uint8_t *bitslice; uint8_t *bitslice;
PTable counts[256]; int64_t counts[256];
} Slice; } Slice;
typedef struct MagicYUVContext { typedef struct MagicYUVContext {
@ -288,11 +288,11 @@ static void calculate_codes(HuffEntry *he, uint16_t codes_count[33])
} }
static void count_usage(const uint8_t *src, int width, static void count_usage(const uint8_t *src, int width,
int height, PTable *counts) int height, int64_t *counts)
{ {
for (int j = 0; j < height; j++) { for (int j = 0; j < height; j++) {
for (int i = 0; i < width; i++) for (int i = 0; i < width; i++)
counts[src[i]].prob++; counts[src[i]]++;
src += width; src += width;
} }
} }
@ -378,7 +378,7 @@ static int count_plane_slice(AVCodecContext *avctx, int n, int plane)
MagicYUVContext *s = avctx->priv_data; MagicYUVContext *s = avctx->priv_data;
Slice *sl = &s->slices[n * s->planes + plane]; Slice *sl = &s->slices[n * s->planes + plane];
const uint8_t *dst = sl->slice; const uint8_t *dst = sl->slice;
PTable *counts = sl->counts; int64_t *counts = sl->counts;
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;
@ -405,10 +405,10 @@ static int encode_table(AVCodecContext *avctx,
for (int n = 0; n < s->nb_slices; n++) { for (int n = 0; n < s->nb_slices; n++) {
Slice *sl = &s->slices[n * s->planes + plane]; Slice *sl = &s->slices[n * s->planes + plane];
PTable *slice_counts = sl->counts; int64_t *slice_counts = sl->counts;
for (int i = 0; i < 256; i++) for (int i = 0; i < 256; i++)
counts[i].prob += slice_counts[i].prob; counts[i].prob += slice_counts[i];
} }
magy_huffman_compute_bits(counts, he, codes_counts, 256, 12); magy_huffman_compute_bits(counts, he, codes_counts, 256, 12);