diff options
Diffstat (limited to 'libavcodec/cljr.c')
| -rw-r--r-- | libavcodec/cljr.c | 56 |
1 files changed, 46 insertions, 10 deletions
diff --git a/libavcodec/cljr.c b/libavcodec/cljr.c index a5ee73864c..2b0142b979 100644 --- a/libavcodec/cljr.c +++ b/libavcodec/cljr.c @@ -2,20 +2,20 @@ * Cirrus Logic AccuPak (CLJR) codec * Copyright (c) 2003 Alex Beregszaszi * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -25,17 +25,21 @@ */ #include "avcodec.h" +#include "libavutil/opt.h" #include "get_bits.h" #include "put_bits.h" typedef struct CLJRContext { + AVClass *avclass; AVFrame picture; + int dither_type; } CLJRContext; static av_cold int common_init(AVCodecContext *avctx) { CLJRContext * const a = avctx->priv_data; + avcodec_get_frame_defaults(&a->picture); avctx->coded_frame = &a->picture; return 0; @@ -57,6 +61,11 @@ static int decode_frame(AVCodecContext *avctx, if (p->data[0]) avctx->release_buffer(avctx, p); + if (avctx->height <= 0 || avctx->width <= 0) { + av_log(avctx, AV_LOG_ERROR, "Invalid width or height\n"); + return AVERROR_INVALIDDATA; + } + if (buf_size / avctx->height < avctx->width) { av_log(avctx, AV_LOG_ERROR, "Resolution larger than buffer size. Invalid header?\n"); @@ -126,9 +135,16 @@ AVCodec ff_cljr_decoder = { static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data) { + CLJRContext *a = avctx->priv_data; PutBitContext pb; AVFrame *p = data; int x, y; + uint32_t dither= avctx->frame_number; + static const uint32_t ordered_dither[2][2] = + { + { 0x10400000, 0x104F0000 }, + { 0xCB2A0000, 0xCB250000 }, + }; p->pict_type = AV_PICTURE_TYPE_I; p->key_frame = 1; @@ -140,13 +156,18 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, uint8_t *cb = &p->data[1][y * p->linesize[1]]; uint8_t *cr = &p->data[2][y * p->linesize[2]]; for (x = 0; x < avctx->width; x += 4) { - put_bits(&pb, 5, luma[3] >> 3); - put_bits(&pb, 5, luma[2] >> 3); - put_bits(&pb, 5, luma[1] >> 3); - put_bits(&pb, 5, luma[0] >> 3); + switch (a->dither_type) { + case 0: dither = 0x492A0000; break; + case 1: dither = dither * 1664525 + 1013904223; break; + case 2: dither = ordered_dither[ y&1 ][ (x>>2)&1 ];break; + } + put_bits(&pb, 5, (luma[3] + (dither>>29) ) >> 3); + put_bits(&pb, 5, (luma[2] + ((dither>>26)&7)) >> 3); + put_bits(&pb, 5, (luma[1] + ((dither>>23)&7)) >> 3); + put_bits(&pb, 5, (luma[0] + ((dither>>20)&7)) >> 3); luma += 4; - put_bits(&pb, 6, *(cb++) >> 2); - put_bits(&pb, 6, *(cr++) >> 2); + put_bits(&pb, 6, (*(cb++) + ((dither>>18)&3)) >> 2); + put_bits(&pb, 6, (*(cr++) + ((dither>>16)&3)) >> 2); } } @@ -155,6 +176,20 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, return put_bits_count(&pb) / 8; } +#define OFFSET(x) offsetof(CLJRContext, x) +#define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM +static const AVOption options[] = { + { "dither_type", "Dither type", OFFSET(dither_type), AV_OPT_TYPE_INT, { .dbl=1 }, 0, 2, VE}, + { NULL }, +}; + +static const AVClass class = { + .class_name = "cljr encoder", + .item_name = av_default_item_name, + .option = options, + .version = LIBAVUTIL_VERSION_INT, +}; + AVCodec ff_cljr_encoder = { .name = "cljr", .type = AVMEDIA_TYPE_VIDEO, @@ -165,5 +200,6 @@ AVCodec ff_cljr_encoder = { .pix_fmts = (const enum PixelFormat[]) { PIX_FMT_YUV411P, PIX_FMT_NONE }, .long_name = NULL_IF_CONFIG_SMALL("Cirrus Logic AccuPak"), + .priv_class = &class, }; #endif |