On Sun, Jun 23, 2013 at 07:37:15PM -0400, Derek Buitenhuis wrote:
> Signed-off-by: Derek Buitenhuis <[email protected]>
> ---
> For Kostya.
If I really needed it I'd RE it myself (I hope I'm able to).
And it still misses HQ, HQA and HQX support ;)
Thanks anyway.
> ---
> libavcodec/cllc.c | 104
> +++++++++++++++++++++++++++++++++++++++++++++++++++++-
> 1 file changed, 103 insertions(+), 1 deletion(-)
>
> diff --git a/libavcodec/cllc.c b/libavcodec/cllc.c
> index a6b51b3..c371c5c 100644
> --- a/libavcodec/cllc.c
> +++ b/libavcodec/cllc.c
> @@ -1,7 +1,7 @@
> /*
> * Canopus Lossless Codec decoder
> *
> - * Copyright (c) 2012 Derek Buitenhuis
> + * Copyright (c) 2012-2013 Derek Buitenhuis
> *
> * This file is part of Libav.
> *
> @@ -179,6 +179,40 @@ static int read_rgb24_component_line(CLLCContext *ctx,
> GetBitContext *gb,
> return 0;
> }
>
> +static int read_yuv_component_line(CLLCContext *ctx, GetBitContext *gb,
> + int *top_left, VLC *vlc, uint8_t *outbuf,
> + int luma)
> +{
> + uint8_t *dst;
> + int pred, code;
> + int i;
> + int step;
> +
> + OPEN_READER(bits, gb);
> +
> + dst = outbuf;
> + pred = *top_left;
> +
> + step = luma ? 4 : 2;
The way you call it it should be named is_chroma.
And I suspect it would be slightly nicer if you made it planar (i.e. no
messing with steps).
> + /* Simultaneously read and restore the line */
> + for (i = 0; i < ctx->avctx->width / (step / 2); i++) {
> + UPDATE_CACHE(bits, gb);
> + GET_VLC(code, bits, gb, vlc->table, 7, 2);
> +
> + pred += code;
> + dst[0] = pred;
> + dst += step;
> + }
> + CLOSE_READER(bits, gb);
> +
> + /* Stash the first pixel */
> + *top_left = dst[-2 * ctx->avctx->width];
> +
> + return 0;
> +}
> +
> static int decode_argb_frame(CLLCContext *ctx, GetBitContext *gb, AVFrame
> *pic)
> {
> AVCodecContext *avctx = ctx->avctx;
> @@ -267,6 +301,59 @@ static int decode_rgb24_frame(CLLCContext *ctx,
> GetBitContext *gb, AVFrame *pic)
> return 0;
> }
>
> +static int decode_yuv_frame(CLLCContext *ctx, GetBitContext *gb, AVFrame
> *pic)
> +{
> + AVCodecContext *avctx = ctx->avctx;
> + uint8_t block;
> + uint8_t *dst;
> + int pred[3];
> + int ret;
> + int i, j;
> + VLC vlc[2];
> +
> + pred[0] = 0x80;
> + pred[1] = 0x80;
> + pred[2] = 0x80;
> +
> + dst = pic->data[0];
> +
> + skip_bits(gb, 8);
> +
> + block = get_bits(gb, 8);
> + if (block) {
> + av_log(ctx->avctx, AV_LOG_ERROR,
> + "Blocked YUV support is not implemented.");
> + return AVERROR_PATCHWELCOME;
> + }
> +
> + /* Read in code table for luma and chroma */
> + for (i = 0; i < 2; i++) {
> + ret = read_code_table(ctx, gb, &vlc[i]);
> + if (ret < 0) {
> + for (j = 0; j <= i; j++)
> + ff_free_vlc(&vlc[j]);
> +
> + av_log(ctx->avctx, AV_LOG_ERROR,
> + "Could not read code table %d.\n", i);
> + return ret;
> + }
> + }
> +
> + /* Read in and restore every line */
> + 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, gb, &pred[1], &vlc[1], &dst[1], 1); /*
> U */
> + read_yuv_component_line(ctx, gb, &pred[2], &vlc[1], &dst[3], 1); /*
> V */
> +
> + dst += pic->linesize[0];
> + }
> +
> + for (i = 0; i < 2; i++)
> + ff_free_vlc(&vlc[i]);
> +
> + return 0;
> +}
> +
> static int cllc_decode_frame(AVCodecContext *avctx, void *data,
> int *got_picture_ptr, AVPacket *avpkt)
> {
> @@ -324,6 +411,21 @@ static int cllc_decode_frame(AVCodecContext *avctx, void
> *data,
> av_log(avctx, AV_LOG_DEBUG, "Frame coding type: %d\n", coding_type);
>
> switch (coding_type) {
> + case 0:
> + avctx->pix_fmt = AV_PIX_FMT_YUYV422;
> + avctx->bits_per_raw_sample = 8;
> +
> + ret = ff_get_buffer(avctx, pic, 0);
> + if (ret < 0) {
> + av_log(avctx, AV_LOG_ERROR, "Could not allocated buffer.\n");
> + return ret;
> + }
> +
> + ret = decode_yuv_frame(ctx, &gb, pic);
> + if (ret < 0)
> + return ret;
> +
> + break;
> case 1:
> case 2:
> avctx->pix_fmt = AV_PIX_FMT_RGB24;
> --
in general looks nice and simple
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
