Commit f4bb38cc authored by Derek Buitenhuis's avatar Derek Buitenhuis

cllc: Rename some funcs to represent what they actually do

This is in preparation for adding support for other colorspaces
and coding types.
Signed-off-by: 's avatarDerek Buitenhuis <derek.buitenhuis@gmail.com>
parent 3b9e832e
...@@ -74,8 +74,8 @@ static int read_code_table(CLLCContext *ctx, GetBitContext *gb, VLC *vlc) ...@@ -74,8 +74,8 @@ static int read_code_table(CLLCContext *ctx, GetBitContext *gb, VLC *vlc)
codes, 2, 2, symbols, 1, 1, 0); codes, 2, 2, symbols, 1, 1, 0);
} }
static int read_line(CLLCContext *ctx, GetBitContext *gb, int *top_left, static int read_rgb24_component_line(CLLCContext *ctx, GetBitContext *gb,
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;
...@@ -104,7 +104,7 @@ static int read_line(CLLCContext *ctx, GetBitContext *gb, int *top_left, ...@@ -104,7 +104,7 @@ static int read_line(CLLCContext *ctx, GetBitContext *gb, int *top_left,
return 0; return 0;
} }
static int decode_bgr24_frame(CLLCContext *ctx, GetBitContext *gb, AVFrame *pic) static int decode_rgb24_frame(CLLCContext *ctx, GetBitContext *gb, AVFrame *pic)
{ {
AVCodecContext *avctx = ctx->avctx; AVCodecContext *avctx = ctx->avctx;
uint8_t *dst; uint8_t *dst;
...@@ -137,7 +137,7 @@ static int decode_bgr24_frame(CLLCContext *ctx, GetBitContext *gb, AVFrame *pic) ...@@ -137,7 +137,7 @@ static int decode_bgr24_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_line(ctx, gb, &pred[j], &vlc[j], &dst[j]); read_rgb24_component_line(ctx, gb, &pred[j], &vlc[j], &dst[j]);
dst += pic->linesize[0]; dst += pic->linesize[0];
} }
...@@ -219,7 +219,7 @@ static int cllc_decode_frame(AVCodecContext *avctx, void *data, ...@@ -219,7 +219,7 @@ static int cllc_decode_frame(AVCodecContext *avctx, void *data,
return ret; return ret;
} }
ret = decode_bgr24_frame(ctx, &gb, pic); ret = decode_rgb24_frame(ctx, &gb, pic);
if (ret < 0) if (ret < 0)
return ret; return ret;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment