diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-06 21:58:47 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-06 22:00:59 +0400 |
commit | 225c5cc8153588d61d65ec1afc1e843425d12785 (patch) | |
tree | 02f2f9de16b9b7b0c69b105dd37d893b52a4afe1 | |
parent | 3a29af4efc608d63bac72bf1572aff45cab22766 (diff) | |
parent | 373a6dda5422186bc057297342a9e559a564595e (diff) |
Merge commit '373a6dda5422186bc057297342a9e559a564595e'
* commit '373a6dda5422186bc057297342a9e559a564595e':
cljr: split decoder and encoder
Conflicts:
libavcodec/Makefile
libavcodec/cljrdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r-- | libavcodec/Makefile | 4 | ||||
-rw-r--r-- | libavcodec/cljrdec.c | 95 | ||||
-rw-r--r-- | libavcodec/cljrenc.c (renamed from libavcodec/cljr.c) | 77 |
3 files changed, 102 insertions, 74 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index ecec9d00e5..10cc77cc62 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -169,8 +169,8 @@ OBJS-$(CONFIG_CDGRAPHICS_DECODER) += cdgraphics.o OBJS-$(CONFIG_CDXL_DECODER) += cdxl.o OBJS-$(CONFIG_CINEPAK_DECODER) += cinepak.o OBJS-$(CONFIG_CINEPAK_ENCODER) += cinepakenc.o elbg.o -OBJS-$(CONFIG_CLJR_DECODER) += cljr.o -OBJS-$(CONFIG_CLJR_ENCODER) += cljr.o +OBJS-$(CONFIG_CLJR_DECODER) += cljrdec.o +OBJS-$(CONFIG_CLJR_ENCODER) += cljrenc.o OBJS-$(CONFIG_CLLC_DECODER) += cllc.o OBJS-$(CONFIG_COOK_DECODER) += cook.o OBJS-$(CONFIG_COMFORTNOISE_DECODER) += cngdec.o celp_filters.o diff --git a/libavcodec/cljrdec.c b/libavcodec/cljrdec.c new file mode 100644 index 0000000000..2198072408 --- /dev/null +++ b/libavcodec/cljrdec.c @@ -0,0 +1,95 @@ +/* + * Cirrus Logic AccuPak (CLJR) decoder + * Copyright (c) 2003 Alex Beregszaszi + * + * This file is part of FFmpeg. + * + * 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. + * + * 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 FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * Cirrus Logic AccuPak decoder. + */ + +#include "avcodec.h" +#include "libavutil/opt.h" +#include "get_bits.h" +#include "internal.h" + +static int decode_frame(AVCodecContext *avctx, + void *data, int *got_frame, + AVPacket *avpkt) +{ + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; + GetBitContext gb; + AVFrame * const p = data; + int x, y, ret; + + 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"); + return AVERROR_INVALIDDATA; + } + + if ((ret = ff_get_buffer(avctx, p, 0)) < 0) + return ret; + p->pict_type = AV_PICTURE_TYPE_I; + p->key_frame = 1; + + init_get_bits(&gb, buf, buf_size * 8); + + for (y = 0; y < avctx->height; y++) { + uint8_t *luma = &p->data[0][y * p->linesize[0]]; + 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) { + luma[3] = (get_bits(&gb, 5)*33) >> 2; + luma[2] = (get_bits(&gb, 5)*33) >> 2; + luma[1] = (get_bits(&gb, 5)*33) >> 2; + luma[0] = (get_bits(&gb, 5)*33) >> 2; + luma += 4; + *(cb++) = get_bits(&gb, 6) << 2; + *(cr++) = get_bits(&gb, 6) << 2; + } + } + + *got_frame = 1; + + return buf_size; +} + +static av_cold int decode_init(AVCodecContext *avctx) +{ + avctx->pix_fmt = AV_PIX_FMT_YUV411P; + return 0; +} + +AVCodec ff_cljr_decoder = { + .name = "cljr", + .long_name = NULL_IF_CONFIG_SMALL("Cirrus Logic AccuPak"), + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_CLJR, + .init = decode_init, + .decode = decode_frame, + .capabilities = CODEC_CAP_DR1, +}; + diff --git a/libavcodec/cljr.c b/libavcodec/cljrenc.c index d835870aeb..c672f800f6 100644 --- a/libavcodec/cljr.c +++ b/libavcodec/cljrenc.c @@ -1,5 +1,5 @@ /* - * Cirrus Logic AccuPak (CLJR) codec + * Cirrus Logic AccuPak (CLJR) encoder * Copyright (c) 2003 Alex Beregszaszi * * This file is part of FFmpeg. @@ -21,82 +21,16 @@ /** * @file - * Cirrus Logic AccuPak codec. + * Cirrus Logic AccuPak encoder. */ -#include "avcodec.h" +#include "libavutil/common.h" #include "libavutil/opt.h" -#include "get_bits.h" + +#include "avcodec.h" #include "internal.h" #include "put_bits.h" -#if CONFIG_CLJR_DECODER -static int decode_frame(AVCodecContext *avctx, - void *data, int *got_frame, - AVPacket *avpkt) -{ - const uint8_t *buf = avpkt->data; - int buf_size = avpkt->size; - GetBitContext gb; - AVFrame * const p = data; - int x, y, ret; - - 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"); - return AVERROR_INVALIDDATA; - } - - if ((ret = ff_get_buffer(avctx, p, 0)) < 0) - return ret; - p->pict_type = AV_PICTURE_TYPE_I; - p->key_frame = 1; - - init_get_bits(&gb, buf, buf_size * 8); - - for (y = 0; y < avctx->height; y++) { - uint8_t *luma = &p->data[0][y * p->linesize[0]]; - 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) { - luma[3] = (get_bits(&gb, 5)*33) >> 2; - luma[2] = (get_bits(&gb, 5)*33) >> 2; - luma[1] = (get_bits(&gb, 5)*33) >> 2; - luma[0] = (get_bits(&gb, 5)*33) >> 2; - luma += 4; - *(cb++) = get_bits(&gb, 6) << 2; - *(cr++) = get_bits(&gb, 6) << 2; - } - } - - *got_frame = 1; - - return buf_size; -} - -static av_cold int decode_init(AVCodecContext *avctx) -{ - avctx->pix_fmt = AV_PIX_FMT_YUV411P; - return 0; -} - -AVCodec ff_cljr_decoder = { - .name = "cljr", - .long_name = NULL_IF_CONFIG_SMALL("Cirrus Logic AccuPak"), - .type = AVMEDIA_TYPE_VIDEO, - .id = AV_CODEC_ID_CLJR, - .init = decode_init, - .decode = decode_frame, - .capabilities = CODEC_CAP_DR1, -}; -#endif - -#if CONFIG_CLJR_ENCODER typedef struct CLJRContext { AVClass *avclass; int dither_type; @@ -186,4 +120,3 @@ AVCodec ff_cljr_encoder = { AV_PIX_FMT_NONE }, .priv_class = &cljr_class, }; -#endif |