[FFmpeg-cvslog] cljr: split decoder and encoder
Nidhi Makhijani
git at videolan.org
Sun Jul 6 20:10:39 CEST 2014
ffmpeg | branch: master | Nidhi Makhijani <nidhimj22 at gmail.com> | Sat Jul 5 21:22:05 2014 +0530| [373a6dda5422186bc057297342a9e559a564595e] | committer: Diego Biurrun
cljr: split decoder and encoder
Signed-off-by: Diego Biurrun <diego at biurrun.de>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=373a6dda5422186bc057297342a9e559a564595e
---
libavcodec/Makefile | 4 +-
libavcodec/{cljr.c => cljrdec.c} | 75 +----------------------------
libavcodec/cljrenc.c | 97 ++++++++++++++++++++++++++++++++++++++
3 files changed, 101 insertions(+), 75 deletions(-)
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index dc374cb..13ce842 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -141,8 +141,8 @@ OBJS-$(CONFIG_CAVS_DECODER) += cavs.o cavsdec.o cavsdsp.o \
OBJS-$(CONFIG_CDGRAPHICS_DECODER) += cdgraphics.o
OBJS-$(CONFIG_CDXL_DECODER) += cdxl.o
OBJS-$(CONFIG_CINEPAK_DECODER) += cinepak.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/cljr.c b/libavcodec/cljrdec.c
similarity index 57%
rename from libavcodec/cljr.c
rename to libavcodec/cljrdec.c
index ad0f729..e74d1fa 100644
--- a/libavcodec/cljr.c
+++ b/libavcodec/cljrdec.c
@@ -1,5 +1,5 @@
/*
- * Cirrus Logic AccuPak (CLJR) codec
+ * Cirrus Logic AccuPak (CLJR) decoder
* Copyright (c) 2003 Alex Beregszaszi
*
* This file is part of Libav.
@@ -21,15 +21,13 @@
/**
* @file
- * Cirrus Logic AccuPak codec.
+ * Cirrus Logic AccuPak decoder.
*/
#include "avcodec.h"
#include "get_bits.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)
@@ -95,72 +93,3 @@ AVCodec ff_cljr_decoder = {
.decode = decode_frame,
.capabilities = CODEC_CAP_DR1,
};
-#endif
-
-#if CONFIG_CLJR_ENCODER
-static av_cold int encode_init(AVCodecContext *avctx)
-{
- avctx->coded_frame = av_frame_alloc();
- if (!avctx->coded_frame)
- return AVERROR(ENOMEM);
-
- return 0;
-}
-
-static av_cold int encode_close(AVCodecContext *avctx)
-{
- av_frame_free(&avctx->coded_frame);
- return 0;
-}
-
-static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
- const AVFrame *p, int *got_packet)
-{
- PutBitContext pb;
- int x, y, ret;
-
- if ((ret = ff_alloc_packet(pkt, 32*avctx->height*avctx->width/4)) < 0) {
- av_log(avctx, AV_LOG_ERROR, "Error getting output packet.\n");
- return ret;
- }
-
- avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I;
- avctx->coded_frame->key_frame = 1;
-
- init_put_bits(&pb, pkt->data, pkt->size);
-
- 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) {
- 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);
- luma += 4;
- put_bits(&pb, 6, *(cb++) >> 2);
- put_bits(&pb, 6, *(cr++) >> 2);
- }
- }
-
- flush_put_bits(&pb);
-
- pkt->size = put_bits_count(&pb) / 8;
- pkt->flags |= AV_PKT_FLAG_KEY;
- *got_packet = 1;
- return 0;
-}
-
-AVCodec ff_cljr_encoder = {
- .name = "cljr",
- .long_name = NULL_IF_CONFIG_SMALL("Cirrus Logic AccuPak"),
- .type = AVMEDIA_TYPE_VIDEO,
- .id = AV_CODEC_ID_CLJR,
- .init = encode_init,
- .encode2 = encode_frame,
- .close = encode_close,
- .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV411P,
- AV_PIX_FMT_NONE },
-};
-#endif
diff --git a/libavcodec/cljrenc.c b/libavcodec/cljrenc.c
new file mode 100644
index 0000000..2c31555
--- /dev/null
+++ b/libavcodec/cljrenc.c
@@ -0,0 +1,97 @@
+/*
+ * Cirrus Logic AccuPak (CLJR) encoder
+ * Copyright (c) 2003 Alex Beregszaszi
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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,
+ * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * Cirrus Logic AccuPak encoder.
+ */
+
+#include "libavutil/common.h"
+
+#include "avcodec.h"
+#include "internal.h"
+#include "put_bits.h"
+
+static av_cold int encode_init(AVCodecContext *avctx)
+{
+ avctx->coded_frame = av_frame_alloc();
+ if (!avctx->coded_frame)
+ return AVERROR(ENOMEM);
+
+ return 0;
+}
+
+static av_cold int encode_close(AVCodecContext *avctx)
+{
+ av_frame_free(&avctx->coded_frame);
+ return 0;
+}
+
+static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
+ const AVFrame *p, int *got_packet)
+{
+ PutBitContext pb;
+ int x, y, ret;
+
+ if ((ret = ff_alloc_packet(pkt, 32*avctx->height*avctx->width/4)) < 0) {
+ av_log(avctx, AV_LOG_ERROR, "Error getting output packet.\n");
+ return ret;
+ }
+
+ avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I;
+ avctx->coded_frame->key_frame = 1;
+
+ init_put_bits(&pb, pkt->data, pkt->size);
+
+ 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) {
+ 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);
+ luma += 4;
+ put_bits(&pb, 6, *(cb++) >> 2);
+ put_bits(&pb, 6, *(cr++) >> 2);
+ }
+ }
+
+ flush_put_bits(&pb);
+
+ pkt->size = put_bits_count(&pb) / 8;
+ pkt->flags |= AV_PKT_FLAG_KEY;
+ *got_packet = 1;
+ return 0;
+}
+
+AVCodec ff_cljr_encoder = {
+ .name = "cljr",
+ .long_name = NULL_IF_CONFIG_SMALL("Cirrus Logic AccuPak"),
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = AV_CODEC_ID_CLJR,
+ .init = encode_init,
+ .encode2 = encode_frame,
+ .close = encode_close,
+ .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV411P,
+ AV_PIX_FMT_NONE },
+};
More information about the ffmpeg-cvslog
mailing list