har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/huffyuvdec: Use bytestream API for byte-aligned reads

Browse Source 
This also allows to remove the padding from these buffers.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2024-04-04 21:13:04 +02:00
parent a6979e3bd2
commit a6d6c8442c
1 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
libavcodec/huffyuvdec.c
View File

@ -36,6 +36,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "bswapdsp.h" #include "bswapdsp.h"
#include "bytestream.h"
#include "codec_internal.h" #include "codec_internal.h"
#include "get_bits.h" #include "get_bits.h"
#include "huffyuv.h" #include "huffyuv.h"
@ -86,21 +87,17 @@ typedef struct HYuvDecContext {
} HYuvDecContext; } HYuvDecContext;
#define classic_shift_luma_table_size 42 static const uint8_t classic_shift_luma[] = {
static const unsigned char classic_shift_luma[classic_shift_luma_table_size + AV_INPUT_BUFFER_PADDING_SIZE] = {
34, 36, 35, 69, 135, 232, 9, 16, 10, 24, 11, 23, 12, 16, 13, 10, 34, 36, 35, 69, 135, 232, 9, 16, 10, 24, 11, 23, 12, 16, 13, 10,
14, 8, 15, 8, 16, 8, 17, 20, 16, 10, 207, 206, 205, 236, 11, 8, 14, 8, 15, 8, 16, 8, 17, 20, 16, 10, 207, 206, 205, 236, 11, 8,
10, 21, 9, 23, 8, 8, 199, 70, 69, 68, 0, 10, 21, 9, 23, 8, 8, 199, 70, 69, 68,
0,0,0,0,0,0,0,0,
}; };
#define classic_shift_chroma_table_size 59 static const uint8_t classic_shift_chroma[] = {
static const unsigned char classic_shift_chroma[classic_shift_chroma_table_size + AV_INPUT_BUFFER_PADDING_SIZE] = {
66, 36, 37, 38, 39, 40, 41, 75, 76, 77, 110, 239, 144, 81, 82, 83, 66, 36, 37, 38, 39, 40, 41, 75, 76, 77, 110, 239, 144, 81, 82, 83,
84, 85, 118, 183, 56, 57, 88, 89, 56, 89, 154, 57, 58, 57, 26, 141, 84, 85, 118, 183, 56, 57, 88, 89, 56, 89, 154, 57, 58, 57, 26, 141,
57, 56, 58, 57, 58, 57, 184, 119, 214, 245, 116, 83, 82, 49, 80, 79, 57, 56, 58, 57, 58, 57, 184, 119, 214, 245, 116, 83, 82, 49, 80, 79,
78, 77, 44, 75, 41, 40, 39, 38, 37, 36, 34, 0, 78, 77, 44, 75, 41, 40, 39, 38, 37, 36, 34,
0,0,0,0,0,0,0,0,
}; };
static const unsigned char classic_add_luma[256] = { static const unsigned char classic_add_luma[256] = {
@ -141,23 +138,30 @@ static const unsigned char classic_add_chroma[256] = {
6, 12, 8, 10, 7, 9, 6, 4, 6, 2, 2, 3, 3, 3, 3, 2, 6, 12, 8, 10, 7, 9, 6, 4, 6, 2, 2, 3, 3, 3, 3, 2,
}; };
static int read_len_table(uint8_t *dst, GetBitContext *gb, int n) static int read_len_table(uint8_t *dst, GetByteContext *gb, int n)
{ {
int i, val, repeat; int i, val, repeat;
for (i = 0; i < n;) { for (i = 0; i < n;) {
repeat = get_bits(gb, 3); if (bytestream2_get_bytes_left(gb) <= 0)
val = get_bits(gb, 5); goto error;
if (repeat == 0) repeat = bytestream2_peek_byteu(gb) >> 5;
repeat = get_bits(gb, 8); val = bytestream2_get_byteu(gb) & 0x1F;
if (i + repeat > n || get_bits_left(gb) < 0) { if (repeat == 0) {
av_log(NULL, AV_LOG_ERROR, "Error reading huffman table\n"); if (bytestream2_get_bytes_left(gb) <= 0)
return AVERROR_INVALIDDATA; goto error;
repeat = bytestream2_get_byteu(gb);
} }
if (i + repeat > n)
goto error;
while (repeat--) while (repeat--)
dst[i++] = val; dst[i++] = val;
} }
return 0; return 0;
error:
av_log(NULL, AV_LOG_ERROR, "Error reading huffman table\n");
return AVERROR_INVALIDDATA;
} }
static int generate_joint_tables(HYuvDecContext *s) static int generate_joint_tables(HYuvDecContext *s)
@ -253,12 +257,11 @@ out:
static int read_huffman_tables(HYuvDecContext *s, const uint8_t *src, int length) static int read_huffman_tables(HYuvDecContext *s, const uint8_t *src, int length)
{ {
GetBitContext gb; GetByteContext gb;
int i, ret; int i, ret;
int count = 3; int count = 3;
if ((ret = init_get_bits(&gb, src, length * 8)) < 0) bytestream2_init(&gb, src, length);
return ret;
if (s->version > 2) if (s->version > 2)
count = 1 + s->alpha + 2*s->chroma; count = 1 + s->alpha + 2*s->chroma;
@ -277,21 +280,21 @@ static int read_huffman_tables(HYuvDecContext *s, const uint8_t *src, int length
if ((ret = generate_joint_tables(s)) < 0) if ((ret = generate_joint_tables(s)) < 0)
return ret; return ret;
return (get_bits_count(&gb) + 7) / 8; return bytestream2_tell(&gb);
} }
static int read_old_huffman_tables(HYuvDecContext *s) static int read_old_huffman_tables(HYuvDecContext *s)
{ {
GetBitContext gb; GetByteContext gb;
int i, ret; int i, ret;
init_get_bits(&gb, classic_shift_luma, bytestream2_init(&gb, classic_shift_luma,
classic_shift_luma_table_size * 8); sizeof(classic_shift_luma));
if ((ret = read_len_table(s->len[0], &gb, 256)) < 0) if ((ret = read_len_table(s->len[0], &gb, 256)) < 0)
return ret; return ret;
init_get_bits(&gb, classic_shift_chroma, bytestream2_init(&gb, classic_shift_chroma,
classic_shift_chroma_table_size * 8); sizeof(classic_shift_chroma));
if ((ret = read_len_table(s->len[1], &gb, 256)) < 0) if ((ret = read_len_table(s->len[1], &gb, 256)) < 0)
return ret; return ret;