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

dvdsubdec: Convert to the new bitstream reader 

Signed-off-by: Anton Khirnov <anton@khirnov.net>
This commit is contained in:
Alexandra Hájková 2016-04-09 19:05:56 +02:00 committed by Anton Khirnov
parent 928f8c7ce3
commit d8618570be
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
libavcodec/dvdsubdec.c
View File

@ -20,7 +20,7 @@
*/ */
#include "avcodec.h" #include "avcodec.h"
#include "get_bits.h" #include "bitstream.h"
#include "internal.h" #include "internal.h"
#include "libavutil/attributes.h" #include "libavutil/attributes.h"
@ -50,13 +50,13 @@ static void yuv_a_to_rgba(const uint8_t *ycbcr, const uint8_t *alpha, uint32_t *
} }
} }
static int decode_run_2bit(GetBitContext *gb, int *color) static int decode_run_2bit(BitstreamContext *bc, int *color)
{ {
unsigned int v, t; unsigned int v, t;
v = 0; v = 0;
for (t = 1; v < t && t <= 0x40; t <<= 2) for (t = 1; v < t && t <= 0x40; t <<= 2)
v = (v << 4) | get_bits(gb, 4); v = (v << 4) | bitstream_read(bc, 4);
*color = v & 3; *color = v & 3;
if (v < 4) { /* Code for fill rest of line */ if (v < 4) { /* Code for fill rest of line */
return INT_MAX; return INT_MAX;
@ -64,23 +64,23 @@ static int decode_run_2bit(GetBitContext *gb, int *color)
return v >> 2; return v >> 2;
} }
static int decode_run_8bit(GetBitContext *gb, int *color) static int decode_run_8bit(BitstreamContext *bc, int *color)
{ {
int len; int len;
int has_run = get_bits1(gb); int has_run = bitstream_read_bit(bc);
if (get_bits1(gb)) if (bitstream_read_bit(bc))
*color = get_bits(gb, 8); *color = bitstream_read(bc, 8);
else else
*color = get_bits(gb, 2); *color = bitstream_read(bc, 2);
if (has_run) { if (has_run) {
if (get_bits1(gb)) { if (bitstream_read_bit(bc)) {
len = get_bits(gb, 7); len = bitstream_read(bc, 7);
if (len == 0) if (len == 0)
len = INT_MAX; len = INT_MAX;
else else
len += 9; len += 9;
} else } else
len = get_bits(gb, 3) + 2; len = bitstream_read(bc, 3) + 2;
} else } else
len = 1; len = 1;
return len; return len;
@ -89,24 +89,24 @@ static int decode_run_8bit(GetBitContext *gb, int *color)
static int decode_rle(uint8_t *bitmap, int linesize, int w, int h, static int decode_rle(uint8_t *bitmap, int linesize, int w, int h,
const uint8_t *buf, int start, int buf_size, int is_8bit) const uint8_t *buf, int start, int buf_size, int is_8bit)
{ {
GetBitContext gb; BitstreamContext bc;
int bit_len; int bit_len;
int x, y, len, color; int x, y, len, color;
uint8_t *d; uint8_t *d;
bit_len = (buf_size - start) * 8; bit_len = (buf_size - start) * 8;
init_get_bits(&gb, buf + start, bit_len); bitstream_init(&bc, buf + start, bit_len);
x = 0; x = 0;
y = 0; y = 0;
d = bitmap; d = bitmap;
for(;;) { for(;;) {
if (get_bits_count(&gb) > bit_len) if (bitstream_tell(&bc) > bit_len)
return -1; return -1;
if (is_8bit) if (is_8bit)
len = decode_run_8bit(&gb, &color); len = decode_run_8bit(&bc, &color);
else else
len = decode_run_2bit(&gb, &color); len = decode_run_2bit(&bc, &color);
len = FFMIN(len, w - x); len = FFMIN(len, w - x);
memset(d + x, color, len); memset(d + x, color, len);
x += len; x += len;
@ -117,7 +117,7 @@ static int decode_rle(uint8_t *bitmap, int linesize, int w, int h,
d += linesize; d += linesize;
x = 0; x = 0;
/* byte align */ /* byte align */
align_get_bits(&gb); bitstream_align(&bc);
} }
} }
return 0; return 0;