RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-19 21:36:54 +00:00
Code Issues Projects Releases Wiki Activity

faxcompr: Convert to the new bitstream reader

Browse Source 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
This commit is contained in:
Alexandra Hájková 2016-04-09 21:04:29 +02:00 committed by Anton Khirnov
parent 8df1ac6b78
commit 418ccdd703
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/faxcompr.c
View File

@ -25,7 +25,7 @@
* @author Konstantin Shishkov * @author Konstantin Shishkov
*/ */
#include "avcodec.h" #include "avcodec.h"
#include "get_bits.h" #include "bitstream.h"
#include "put_bits.h" #include "put_bits.h"
#include "faxcompr.h" #include "faxcompr.h"
@ -123,7 +123,7 @@ av_cold void ff_ccitt_unpack_init(void)
} }
static int decode_group3_1d_line(AVCodecContext *avctx, GetBitContext *gb, static int decode_group3_1d_line(AVCodecContext *avctx, BitstreamContext *bc,
unsigned int pix_left, int *runs, unsigned int pix_left, int *runs,
const int *runend) const int *runend)
{ {
@ -131,7 +131,7 @@ static int decode_group3_1d_line(AVCodecContext *avctx, GetBitContext *gb,
unsigned int run = 0; unsigned int run = 0;
unsigned int t; unsigned int t;
for (;;) { for (;;) {
t = get_vlc2(gb, ccitt_vlc[mode].table, 9, 2); t = bitstream_read_vlc(bc, ccitt_vlc[mode].table, 9, 2);
run += t; run += t;
if (t < 64) { if (t < 64) {
*runs++ = run; *runs++ = run;
@ -157,7 +157,7 @@ static int decode_group3_1d_line(AVCodecContext *avctx, GetBitContext *gb,
return 0; return 0;
} }
static int decode_group3_2d_line(AVCodecContext *avctx, GetBitContext *gb, static int decode_group3_2d_line(AVCodecContext *avctx, BitstreamContext *bc,
unsigned int width, int *runs, unsigned int width, int *runs,
const int *runend, const int *ref) const int *runend, const int *ref)
{ {
@ -168,7 +168,7 @@ static int decode_group3_2d_line(AVCodecContext *avctx, GetBitContext *gb,
runend--; // for the last written 0 runend--; // for the last written 0
while (offs < width) { while (offs < width) {
int cmode = get_vlc2(gb, ccitt_group3_2d_vlc.table, 9, 1); int cmode = bitstream_read_vlc(bc, ccitt_group3_2d_vlc.table, 9, 1);
if (cmode == -1) { if (cmode == -1) {
av_log(avctx, AV_LOG_ERROR, "Incorrect mode VLC\n"); av_log(avctx, AV_LOG_ERROR, "Incorrect mode VLC\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
@ -188,7 +188,7 @@ static int decode_group3_2d_line(AVCodecContext *avctx, GetBitContext *gb,
for (k = 0; k < 2; k++) { for (k = 0; k < 2; k++) {
run = 0; run = 0;
for (;;) { for (;;) {
t = get_vlc2(gb, ccitt_vlc[mode].table, 9, 2); t = bitstream_read_vlc(bc, ccitt_vlc[mode].table, 9, 2);
if (t == -1) { if (t == -1) {
av_log(avctx, AV_LOG_ERROR, "Incorrect code\n"); av_log(avctx, AV_LOG_ERROR, "Incorrect code\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
@ -258,12 +258,12 @@ static void put_line(uint8_t *dst, int size, int width, const int *runs)
flush_put_bits(&pb); flush_put_bits(&pb);
} }
static int find_group3_syncmarker(GetBitContext *gb, int srcsize) static int find_group3_syncmarker(BitstreamContext *bc, int srcsize)
{ {
unsigned int state = -1; unsigned int state = -1;
srcsize -= get_bits_count(gb); srcsize -= bitstream_tell(bc);
while (srcsize-- > 0) { while (srcsize-- > 0) {
state += state + get_bits1(gb); state += state + bitstream_read_bit(bc);
if ((state & 0xFFF) == 1) if ((state & 0xFFF) == 1)
return 0; return 0;
} }
@ -275,7 +275,7 @@ int ff_ccitt_unpack(AVCodecContext *avctx, const uint8_t *src, int srcsize,
enum TiffCompr compr, int opts) enum TiffCompr compr, int opts)
{ {
int j; int j;
GetBitContext gb; BitstreamContext bc;
int *runs, *ref = NULL, *runend; int *runs, *ref = NULL, *runend;
int ret; int ret;
int runsize = avctx->width + 2; int runsize = avctx->width + 2;
@ -289,27 +289,27 @@ int ff_ccitt_unpack(AVCodecContext *avctx, const uint8_t *src, int srcsize,
ref[0] = avctx->width; ref[0] = avctx->width;
ref[1] = 0; ref[1] = 0;
ref[2] = 0; ref[2] = 0;
init_get_bits(&gb, src, srcsize * 8); bitstream_init(&bc, src, srcsize * 8);
for (j = 0; j < height; j++) { for (j = 0; j < height; j++) {
runend = runs + runsize; runend = runs + runsize;
if (compr == TIFF_G4) { if (compr == TIFF_G4) {
ret = decode_group3_2d_line(avctx, &gb, avctx->width, runs, runend, ret = decode_group3_2d_line(avctx, &bc, avctx->width, runs, runend,
ref); ref);
if (ret < 0) if (ret < 0)
goto fail; goto fail;
} else { } else {
int g3d1 = (compr == TIFF_G3) && !(opts & 1); int g3d1 = (compr == TIFF_G3) && !(opts & 1);
if (compr != TIFF_CCITT_RLE && if (compr != TIFF_CCITT_RLE &&
find_group3_syncmarker(&gb, srcsize * 8) < 0) find_group3_syncmarker(&bc, srcsize * 8) < 0)
break; break;
if (compr == TIFF_CCITT_RLE || g3d1 || get_bits1(&gb)) if (compr == TIFF_CCITT_RLE || g3d1 || bitstream_read_bit(&bc))
ret = decode_group3_1d_line(avctx, &gb, avctx->width, runs, ret = decode_group3_1d_line(avctx, &bc, avctx->width, runs,
runend); runend);
else else
ret = decode_group3_2d_line(avctx, &gb, avctx->width, runs, ret = decode_group3_2d_line(avctx, &bc, avctx->width, runs,
runend, ref); runend, ref);
if (compr == TIFF_CCITT_RLE) if (compr == TIFF_CCITT_RLE)
align_get_bits(&gb); bitstream_align(&bc);
} }
if (avctx->err_recognition & AV_EF_EXPLODE && ret < 0) if (avctx->err_recognition & AV_EF_EXPLODE && ret < 0)
goto fail; goto fail;