Merge commit '373a6dda5422186bc057297342a9e559a564595e'

* commit '373a6dda5422186bc057297342a9e559a564595e':
  cljr: split decoder and encoder

Conflicts:
	libavcodec/Makefile
	libavcodec/cljrdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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,
+};
+

libavcodec/cljr.c → 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