RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

dvbsubdec: cosmetic change on how xpos is passed around 

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
JULIAN GARDNER 2011-10-14 14:36:56 +02:00 committed by Michael Niedermayer
parent bca8bd99d0
commit 3e01c9b547
1 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
libavcodec/dvbsubdec.c
View File

@ -469,16 +469,18 @@ static av_cold int dvbsub_close_decoder(AVCodecContext *avctx)
static int dvbsub_read_2bit_string(uint8_t *destbuf, int dbuf_len, static int dvbsub_read_2bit_string(uint8_t *destbuf, int dbuf_len,
const uint8_t **srcbuf, int buf_size, const uint8_t **srcbuf, int buf_size,
int non_mod, uint8_t *map_table) int non_mod, uint8_t *map_table, int x_pos)
{ {
GetBitContext gb; GetBitContext gb;
int bits; int bits;
int run_length; int run_length;
int pixels_read = 0; int pixels_read = x_pos;
init_get_bits(&gb, *srcbuf, buf_size << 3); init_get_bits(&gb, *srcbuf, buf_size << 3);
destbuf += x_pos;
while (get_bits_count(&gb) < buf_size << 3 && pixels_read < dbuf_len) { while (get_bits_count(&gb) < buf_size << 3 && pixels_read < dbuf_len) {
bits = get_bits(&gb, 2); bits = get_bits(&gb, 2);
@ -574,16 +576,18 @@ static int dvbsub_read_2bit_string(uint8_t *destbuf, int dbuf_len,
static int dvbsub_read_4bit_string(uint8_t *destbuf, int dbuf_len, static int dvbsub_read_4bit_string(uint8_t *destbuf, int dbuf_len,
const uint8_t **srcbuf, int buf_size, const uint8_t **srcbuf, int buf_size,
int non_mod, uint8_t *map_table) int non_mod, uint8_t *map_table, int x_pos)
{ {
GetBitContext gb; GetBitContext gb;
int bits; int bits;
int run_length; int run_length;
int pixels_read = 0; int pixels_read = x_pos;
init_get_bits(&gb, *srcbuf, buf_size << 3); init_get_bits(&gb, *srcbuf, buf_size << 3);
destbuf += x_pos;
while (get_bits_count(&gb) < buf_size << 3 && pixels_read < dbuf_len) { while (get_bits_count(&gb) < buf_size << 3 && pixels_read < dbuf_len) {
bits = get_bits(&gb, 4); bits = get_bits(&gb, 4);
@ -695,12 +699,14 @@ static int dvbsub_read_4bit_string(uint8_t *destbuf, int dbuf_len,
static int dvbsub_read_8bit_string(uint8_t *destbuf, int dbuf_len, static int dvbsub_read_8bit_string(uint8_t *destbuf, int dbuf_len,
const uint8_t **srcbuf, int buf_size, const uint8_t **srcbuf, int buf_size,
int non_mod, uint8_t *map_table) int non_mod, uint8_t *map_table, int x_pos)
{ {
const uint8_t *sbuf_end = (*srcbuf) + buf_size; const uint8_t *sbuf_end = (*srcbuf) + buf_size;
int bits; int bits;
int run_length; int run_length;
int pixels_read = 0; int pixels_read = x_pos;
destbuf += x_pos;
while (*srcbuf < sbuf_end && pixels_read < dbuf_len) { while (*srcbuf < sbuf_end && pixels_read < dbuf_len) {
bits = *(*srcbuf)++; bits = *(*srcbuf)++;
@ -812,9 +818,9 @@ static void dvbsub_parse_pixel_data_block(AVCodecContext *avctx, DVBSubObjectDis
else else
map_table = NULL; map_table = NULL;
x_pos += dvbsub_read_2bit_string(pbuf + (y_pos * region->width) + x_pos, x_pos = dvbsub_read_2bit_string(pbuf + (y_pos * region->width),
region->width - x_pos, &buf, buf_end - buf, region->width, &buf, buf_end - buf,
non_mod, map_table); non_mod, map_table, x_pos);
break; break;
case 0x11: case 0x11:
if (region->depth < 4) { if (region->depth < 4) {
@ -827,9 +833,9 @@ static void dvbsub_parse_pixel_data_block(AVCodecContext *avctx, DVBSubObjectDis
else else
map_table = NULL; map_table = NULL;
x_pos += dvbsub_read_4bit_string(pbuf + (y_pos * region->width) + x_pos, x_pos = dvbsub_read_4bit_string(pbuf + (y_pos * region->width),
region->width - x_pos, &buf, buf_end - buf, region->width, &buf, buf_end - buf,
non_mod, map_table); non_mod, map_table, x_pos);
break; break;
case 0x12: case 0x12:
if (region->depth < 8) { if (region->depth < 8) {
@ -837,9 +843,9 @@ static void dvbsub_parse_pixel_data_block(AVCodecContext *avctx, DVBSubObjectDis
return; return;
} }
x_pos += dvbsub_read_8bit_string(pbuf + (y_pos * region->width) + x_pos, x_pos = dvbsub_read_8bit_string(pbuf + (y_pos * region->width),
region->width - x_pos, &buf, buf_end - buf, region->width, &buf, buf_end - buf,
non_mod, NULL); non_mod, NULL, x_pos);
break; break;
case 0x20: case 0x20: