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/dvbsubdec: convert dvbsub_read_8bit_string to bytestream reader

Browse Source 
No change in functionality.

Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint
2025-08-03 01:01:31 +02:00
parent 74f470c05c
commit aeb6ea51f5
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libavcodec/dvbsubdec.c
View File

@ -612,15 +612,16 @@ static int dvbsub_read_8bit_string(AVCodecContext *avctx,
const uint8_t **srcbuf, int buf_size, const uint8_t **srcbuf, int buf_size,
int non_mod, uint8_t *map_table, int x_pos) int non_mod, uint8_t *map_table, int x_pos)
{ {
const uint8_t *sbuf_end = (*srcbuf) + buf_size;
int bits; int bits;
int run_length; int run_length;
int pixels_read = x_pos; int pixels_read = x_pos;
GetByteContext gb0, *const gb = &gb0;
bytestream2_init(gb, *srcbuf, buf_size);
destbuf += x_pos; destbuf += x_pos;
while (*srcbuf < sbuf_end && pixels_read < dbuf_len) { while (bytestream2_get_bytes_left(gb) && pixels_read < dbuf_len) {
bits = *(*srcbuf)++; bits = bytestream2_get_byteu(gb);
if (bits) { if (bits) {
if (non_mod != 1 || bits != 1) { if (non_mod != 1 || bits != 1) {
@ -631,16 +632,17 @@ static int dvbsub_read_8bit_string(AVCodecContext *avctx,
} }
pixels_read++; pixels_read++;
} else { } else {
bits = *(*srcbuf)++; bits = bytestream2_get_byte(gb);
run_length = bits & 0x7f; run_length = bits & 0x7f;
if ((bits & 0x80) == 0) { if ((bits & 0x80) == 0) {
if (run_length == 0) { if (run_length == 0) {
*srcbuf += bytestream2_tell(gb);
return pixels_read; return pixels_read;
} }
bits = 0; bits = 0;
} else { } else {
bits = *(*srcbuf)++; bits = bytestream2_get_byte(gb);
} }
if (non_mod == 1 && bits == 1) if (non_mod == 1 && bits == 1)
pixels_read += run_length; pixels_read += run_length;
@ -655,9 +657,10 @@ static int dvbsub_read_8bit_string(AVCodecContext *avctx,
} }
} }
if (*(*srcbuf)++) if (bytestream2_get_byte(gb))
av_log(avctx, AV_LOG_ERROR, "line overflow\n"); av_log(avctx, AV_LOG_ERROR, "line overflow\n");
*srcbuf += bytestream2_tell(gb);
return pixels_read; return pixels_read;
} }