virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

cllc: 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-02-06 21:41:31 +01:00
committed by Anton Khirnov
parent dd3d7ddf2a
commit d182d8a6d3
1 changed files with 36 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
libavcodec/cllc.c
View File

@@ -23,11 +23,13 @@
#include <inttypes.h> #include <inttypes.h>
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "bitstream.h"
#include "bswapdsp.h" #include "bswapdsp.h"
#include "canopus.h" #include "canopus.h"
#include "get_bits.h"
#include "avcodec.h" #include "avcodec.h"
#include "internal.h" #include "internal.h"
#include "vlc.h"
typedef struct CLLCContext { typedef struct CLLCContext {
AVCodecContext *avctx; AVCodecContext *avctx;
@@ -37,7 +39,7 @@ typedef struct CLLCContext {
int swapped_buf_size; int swapped_buf_size;
} CLLCContext; } CLLCContext;
static int read_code_table(CLLCContext *ctx, GetBitContext *gb, VLC *vlc) static int read_code_table(CLLCContext *ctx, BitstreamContext *bc, VLC *vlc)
{ {
uint8_t symbols[256]; uint8_t symbols[256];
uint8_t bits[256]; uint8_t bits[256];
@@ -49,10 +51,10 @@ static int read_code_table(CLLCContext *ctx, GetBitContext *gb, VLC *vlc)
count = 0; count = 0;
num_codes_sum = 0; num_codes_sum = 0;
num_lens = get_bits(gb, 5); num_lens = bitstream_read(bc, 5);
for (i = 0; i < num_lens; i++) { for (i = 0; i < num_lens; i++) {
num_codes = get_bits(gb, 9); num_codes = bitstream_read(bc, 9);
num_codes_sum += num_codes; num_codes_sum += num_codes;
if (num_codes_sum > 256) { if (num_codes_sum > 256) {
@@ -64,7 +66,7 @@ static int read_code_table(CLLCContext *ctx, GetBitContext *gb, VLC *vlc)
} }
for (j = 0; j < num_codes; j++) { for (j = 0; j < num_codes; j++) {
symbols[count] = get_bits(gb, 8); symbols[count] = bitstream_read(bc, 8);
bits[count] = i + 1; bits[count] = i + 1;
codes[count] = prefix++; codes[count] = prefix++;
@@ -82,7 +84,7 @@ static int read_code_table(CLLCContext *ctx, GetBitContext *gb, VLC *vlc)
* Unlike the RGB24 read/restore, which reads in a component at a time, * Unlike the RGB24 read/restore, which reads in a component at a time,
* ARGB read/restore reads in ARGB quads. * ARGB read/restore reads in ARGB quads.
*/ */
static int read_argb_line(CLLCContext *ctx, GetBitContext *gb, int *top_left, static int read_argb_line(CLLCContext *ctx, BitstreamContext *bc, int *top_left,
VLC *vlc, uint8_t *outbuf) VLC *vlc, uint8_t *outbuf)
{ {
uint8_t *dst; uint8_t *dst;
@@ -90,8 +92,6 @@ static int read_argb_line(CLLCContext *ctx, GetBitContext *gb, int *top_left,
int code; int code;
int i; int i;
OPEN_READER(bits, gb);
dst = outbuf; dst = outbuf;
pred[0] = top_left[0]; pred[0] = top_left[0];
pred[1] = top_left[1]; pred[1] = top_left[1];
@@ -100,8 +100,7 @@ static int read_argb_line(CLLCContext *ctx, GetBitContext *gb, int *top_left,
for (i = 0; i < ctx->avctx->width; i++) { for (i = 0; i < ctx->avctx->width; i++) {
/* Always get the alpha component */ /* Always get the alpha component */
UPDATE_CACHE(bits, gb); code = bitstream_read_vlc(bc, vlc[0].table, 7, 2);
GET_VLC(code, bits, gb, vlc[0].table, 7, 2);
pred[0] += code; pred[0] += code;
dst[0] = pred[0]; dst[0] = pred[0];
@@ -109,22 +108,19 @@ static int read_argb_line(CLLCContext *ctx, GetBitContext *gb, int *top_left,
/* Skip the components if they are entirely transparent */ /* Skip the components if they are entirely transparent */
if (dst[0]) { if (dst[0]) {
/* Red */ /* Red */
UPDATE_CACHE(bits, gb); code = bitstream_read_vlc(bc, vlc[1].table, 7, 2);
GET_VLC(code, bits, gb, vlc[1].table, 7, 2);
pred[1] += code; pred[1] += code;
dst[1] = pred[1]; dst[1] = pred[1];
/* Green */ /* Green */
UPDATE_CACHE(bits, gb); code = bitstream_read_vlc(bc, vlc[2].table, 7, 2);
GET_VLC(code, bits, gb, vlc[2].table, 7, 2);
pred[2] += code; pred[2] += code;
dst[2] = pred[2]; dst[2] = pred[2];
/* Blue */ /* Blue */
UPDATE_CACHE(bits, gb); code = bitstream_read_vlc(bc, vlc[3].table, 7, 2);
GET_VLC(code, bits, gb, vlc[3].table, 7, 2);
pred[3] += code; pred[3] += code;
dst[3] = pred[3]; dst[3] = pred[3];
@@ -137,8 +133,6 @@ static int read_argb_line(CLLCContext *ctx, GetBitContext *gb, int *top_left,
dst += 4; dst += 4;
} }
CLOSE_READER(bits, gb);
top_left[0] = outbuf[0]; top_left[0] = outbuf[0];
/* Only stash components if they are not transparent */ /* Only stash components if they are not transparent */
@@ -151,65 +145,55 @@ static int read_argb_line(CLLCContext *ctx, GetBitContext *gb, int *top_left,
return 0; return 0;
} }
static int read_rgb24_component_line(CLLCContext *ctx, GetBitContext *gb, static int read_rgb24_component_line(CLLCContext *ctx, BitstreamContext *bc,
int *top_left, VLC *vlc, uint8_t *outbuf) int *top_left, VLC *vlc, uint8_t *outbuf)
{ {
uint8_t *dst; uint8_t *dst;
int pred, code; int pred, code;
int i; int i;
OPEN_READER(bits, gb);
dst = outbuf; dst = outbuf;
pred = *top_left; pred = *top_left;
/* Simultaneously read and restore the line */ /* Simultaneously read and restore the line */
for (i = 0; i < ctx->avctx->width; i++) { for (i = 0; i < ctx->avctx->width; i++) {
UPDATE_CACHE(bits, gb); code = bitstream_read_vlc(bc, vlc->table, 7, 2);
GET_VLC(code, bits, gb, vlc->table, 7, 2);
pred += code; pred += code;
dst[0] = pred; dst[0] = pred;
dst += 3; dst += 3;
} }
CLOSE_READER(bits, gb);
/* Stash the first pixel */ /* Stash the first pixel */
*top_left = outbuf[0]; *top_left = outbuf[0];
return 0; return 0;
} }
static int read_yuv_component_line(CLLCContext *ctx, GetBitContext *gb, static int read_yuv_component_line(CLLCContext *ctx, BitstreamContext *bc,
int *top_left, VLC *vlc, uint8_t *outbuf, int *top_left, VLC *vlc, uint8_t *outbuf,
int is_chroma) int is_chroma)
{ {
int pred, code; int pred, code;
int i; int i;
OPEN_READER(bits, gb);
pred = *top_left; pred = *top_left;
/* Simultaneously read and restore the line */ /* Simultaneously read and restore the line */
for (i = 0; i < ctx->avctx->width >> is_chroma; i++) { for (i = 0; i < ctx->avctx->width >> is_chroma; i++) {
UPDATE_CACHE(bits, gb); code = bitstream_read_vlc(bc, vlc->table, 7, 2);
GET_VLC(code, bits, gb, vlc->table, 7, 2);
pred += code; pred += code;
outbuf[i] = pred; outbuf[i] = pred;
} }
CLOSE_READER(bits, gb);
/* Stash the first pixel */ /* Stash the first pixel */
*top_left = outbuf[0]; *top_left = outbuf[0];
return 0; return 0;
} }
static int decode_argb_frame(CLLCContext *ctx, GetBitContext *gb, AVFrame *pic) static int decode_argb_frame(CLLCContext *ctx, BitstreamContext *bc, AVFrame *pic)
{ {
AVCodecContext *avctx = ctx->avctx; AVCodecContext *avctx = ctx->avctx;
uint8_t *dst; uint8_t *dst;
@@ -225,11 +209,11 @@ static int decode_argb_frame(CLLCContext *ctx, GetBitContext *gb, AVFrame *pic)
dst = pic->data[0]; dst = pic->data[0];
skip_bits(gb, 16); bitstream_skip(bc, 16);
/* Read in code table for each plane */ /* Read in code table for each plane */
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
ret = read_code_table(ctx, gb, &vlc[i]); ret = read_code_table(ctx, bc, &vlc[i]);
if (ret < 0) { if (ret < 0) {
for (j = 0; j <= i; j++) for (j = 0; j <= i; j++)
ff_free_vlc(&vlc[j]); ff_free_vlc(&vlc[j]);
@@ -242,7 +226,7 @@ static int decode_argb_frame(CLLCContext *ctx, GetBitContext *gb, AVFrame *pic)
/* Read in and restore every line */ /* Read in and restore every line */
for (i = 0; i < avctx->height; i++) { for (i = 0; i < avctx->height; i++) {
read_argb_line(ctx, gb, pred, vlc, dst); read_argb_line(ctx, bc, pred, vlc, dst);
dst += pic->linesize[0]; dst += pic->linesize[0];
} }
@@ -253,7 +237,7 @@ static int decode_argb_frame(CLLCContext *ctx, GetBitContext *gb, AVFrame *pic)
return 0; return 0;
} }
static int decode_rgb24_frame(CLLCContext *ctx, GetBitContext *gb, AVFrame *pic) static int decode_rgb24_frame(CLLCContext *ctx, BitstreamContext *bc, AVFrame *pic)
{ {
AVCodecContext *avctx = ctx->avctx; AVCodecContext *avctx = ctx->avctx;
uint8_t *dst; uint8_t *dst;
@@ -268,11 +252,11 @@ static int decode_rgb24_frame(CLLCContext *ctx, GetBitContext *gb, AVFrame *pic)
dst = pic->data[0]; dst = pic->data[0];
skip_bits(gb, 16); bitstream_skip(bc, 16);
/* Read in code table for each plane */ /* Read in code table for each plane */
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
ret = read_code_table(ctx, gb, &vlc[i]); ret = read_code_table(ctx, bc, &vlc[i]);
if (ret < 0) { if (ret < 0) {
for (j = 0; j <= i; j++) for (j = 0; j <= i; j++)
ff_free_vlc(&vlc[j]); ff_free_vlc(&vlc[j]);
@@ -286,7 +270,7 @@ static int decode_rgb24_frame(CLLCContext *ctx, GetBitContext *gb, AVFrame *pic)
/* Read in and restore every line */ /* Read in and restore every line */
for (i = 0; i < avctx->height; i++) { for (i = 0; i < avctx->height; i++) {
for (j = 0; j < 3; j++) for (j = 0; j < 3; j++)
read_rgb24_component_line(ctx, gb, &pred[j], &vlc[j], &dst[j]); read_rgb24_component_line(ctx, bc, &pred[j], &vlc[j], &dst[j]);
dst += pic->linesize[0]; dst += pic->linesize[0];
} }
@@ -297,7 +281,7 @@ static int decode_rgb24_frame(CLLCContext *ctx, GetBitContext *gb, AVFrame *pic)
return 0; return 0;
} }
static int decode_yuv_frame(CLLCContext *ctx, GetBitContext *gb, AVFrame *pic) static int decode_yuv_frame(CLLCContext *ctx, BitstreamContext *bc, AVFrame *pic)
{ {
AVCodecContext *avctx = ctx->avctx; AVCodecContext *avctx = ctx->avctx;
uint8_t block; uint8_t block;
@@ -315,9 +299,9 @@ static int decode_yuv_frame(CLLCContext *ctx, GetBitContext *gb, AVFrame *pic)
dst[1] = pic->data[1]; dst[1] = pic->data[1];
dst[2] = pic->data[2]; dst[2] = pic->data[2];
skip_bits(gb, 8); bitstream_skip(bc, 8);
block = get_bits(gb, 8); block = bitstream_read(bc, 8);
if (block) { if (block) {
avpriv_request_sample(ctx->avctx, "Blocked YUV"); avpriv_request_sample(ctx->avctx, "Blocked YUV");
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
@@ -325,7 +309,7 @@ static int decode_yuv_frame(CLLCContext *ctx, GetBitContext *gb, AVFrame *pic)
/* Read in code table for luma and chroma */ /* Read in code table for luma and chroma */
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
ret = read_code_table(ctx, gb, &vlc[i]); ret = read_code_table(ctx, bc, &vlc[i]);
if (ret < 0) { if (ret < 0) {
for (j = 0; j <= i; j++) for (j = 0; j <= i; j++)
ff_free_vlc(&vlc[j]); ff_free_vlc(&vlc[j]);
@@ -338,9 +322,9 @@ static int decode_yuv_frame(CLLCContext *ctx, GetBitContext *gb, AVFrame *pic)
/* Read in and restore every line */ /* Read in and restore every line */
for (i = 0; i < avctx->height; i++) { for (i = 0; i < avctx->height; i++) {
read_yuv_component_line(ctx, gb, &pred[0], &vlc[0], dst[0], 0); /* Y */ read_yuv_component_line(ctx, bc, &pred[0], &vlc[0], dst[0], 0); /* Y */
read_yuv_component_line(ctx, gb, &pred[1], &vlc[1], dst[1], 1); /* U */ read_yuv_component_line(ctx, bc, &pred[1], &vlc[1], dst[1], 1); /* U */
read_yuv_component_line(ctx, gb, &pred[2], &vlc[1], dst[2], 1); /* V */ read_yuv_component_line(ctx, bc, &pred[2], &vlc[1], dst[2], 1); /* V */
for (j = 0; j < 3; j++) for (j = 0; j < 3; j++)
dst[j] += pic->linesize[j]; dst[j] += pic->linesize[j];
@@ -360,7 +344,7 @@ static int cllc_decode_frame(AVCodecContext *avctx, void *data,
uint8_t *src = avpkt->data; uint8_t *src = avpkt->data;
uint32_t info_tag, info_offset; uint32_t info_tag, info_offset;
int data_size; int data_size;
GetBitContext gb; BitstreamContext bc;
int coding_type, ret; int coding_type, ret;
if (avpkt->size < 4 + 4) { if (avpkt->size < 4 + 4) {
@@ -398,7 +382,7 @@ static int cllc_decode_frame(AVCodecContext *avctx, void *data,
ctx->bdsp.bswap16_buf((uint16_t *) ctx->swapped_buf, (uint16_t *) src, ctx->bdsp.bswap16_buf((uint16_t *) ctx->swapped_buf, (uint16_t *) src,
data_size / 2); data_size / 2);
init_get_bits(&gb, ctx->swapped_buf, data_size * 8); bitstream_init8(&bc, ctx->swapped_buf, data_size);
/* /*
* Read in coding type. The types are as follows: * Read in coding type. The types are as follows:
@@ -422,7 +406,7 @@ static int cllc_decode_frame(AVCodecContext *avctx, void *data,
return ret; return ret;
} }
ret = decode_yuv_frame(ctx, &gb, pic); ret = decode_yuv_frame(ctx, &bc, pic);
if (ret < 0) if (ret < 0)
return ret; return ret;
@@ -438,7 +422,7 @@ static int cllc_decode_frame(AVCodecContext *avctx, void *data,
return ret; return ret;
} }
ret = decode_rgb24_frame(ctx, &gb, pic); ret = decode_rgb24_frame(ctx, &bc, pic);
if (ret < 0) if (ret < 0)
return ret; return ret;
@@ -453,7 +437,7 @@ static int cllc_decode_frame(AVCodecContext *avctx, void *data,
return ret; return ret;
} }
ret = decode_argb_frame(ctx, &gb, pic); ret = decode_argb_frame(ctx, &bc, pic);
if (ret < 0) if (ret < 0)
return ret; return ret;