rgb2rgb: allow conversion for <15 bpp

[ffmpeg] / libavcodec / lclenc.c

diff --git a/libavcodec/lclenc.c b/libavcodec/lclenc.c
index 5385a84e8ad4769c45cbd97ef2c098c25fccec73..4c902d5f1763581ec52bb6bb8c1c486fedf341b3 100644 (file)
--- a/libavcodec/lclenc.c
+++ b/libavcodec/lclenc.c
@@ -2,25 +2,25 @@
  * LCL (LossLess Codec Library) Codec
  * Copyright (c) 2002-2004 Roberto Togni
  *
- * This file is part of FFmpeg.
+ * This file is part of Libav.
  *
- * FFmpeg is free software; you can redistribute it and/or
+ * 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.
  *
- * FFmpeg is distributed in the hope that it will be useful,
+ * 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 FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /**
- * @file libavcodec/lclenc.c
+ * @file
  * LCL (LossLess Codec Library) Video Codec
  * Decoder for MSZH and ZLIB codecs
  * Experimental encoder for ZLIB RGB24
@@ -42,7 +42,6 @@
 #include <stdlib.h>
 
 #include "avcodec.h"
-#include "put_bits.h"
 #include "lcl.h"
 
 #include <zlib.h>
@@ -54,7 +53,6 @@ typedef struct LclEncContext {
 
     AVCodecContext *avctx;
     AVFrame pic;
-    PutBitContext pb;
 
     // Image type
     int imgtype;
@@ -62,12 +60,6 @@ typedef struct LclEncContext {
     int compression;
     // Flags
     int flags;
-    // Decompressed data size
-    unsigned int decomp_size;
-    // Maximum compressed data size
-    unsigned int max_comp_size;
-    // Compression buffer
-    unsigned char* comp_buf;
     z_stream zstream;
 } LclEncContext;
 
@@ -84,7 +76,7 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size,
     int zret; // Zlib return code
 
     *p = *pict;
-    p->pict_type= FF_I_TYPE;
+    p->pict_type= AV_PICTURE_TYPE_I;
     p->key_frame= 1;
 
     if(avctx->pix_fmt != PIX_FMT_BGR24){
@@ -138,26 +130,17 @@ static av_cold int encode_init(AVCodecContext *avctx)
     // Will be user settable someday
     c->compression = 6;
     c->flags = 0;
-
-    switch(avctx->pix_fmt){
-        case PIX_FMT_BGR24:
-            c->imgtype = IMGTYPE_RGB24;
-            c->decomp_size = avctx->width * avctx->height * 3;
-            avctx->bits_per_coded_sample= 24;
-            break;
-        default:
-            av_log(avctx, AV_LOG_ERROR, "Input pixel format %s not supported\n", avcodec_get_pix_fmt_name(avctx->pix_fmt));
-            return -1;
-    }
-
-    ((uint8_t*)avctx->extradata)[0]= 4;
-    ((uint8_t*)avctx->extradata)[1]= 0;
-    ((uint8_t*)avctx->extradata)[2]= 0;
-    ((uint8_t*)avctx->extradata)[3]= 0;
-    ((uint8_t*)avctx->extradata)[4]= c->imgtype;
-    ((uint8_t*)avctx->extradata)[5]= c->compression;
-    ((uint8_t*)avctx->extradata)[6]= c->flags;
-    ((uint8_t*)avctx->extradata)[7]= CODEC_ZLIB;
+    c->imgtype = IMGTYPE_RGB24;
+    avctx->bits_per_coded_sample= 24;
+
+    avctx->extradata[0]= 4;
+    avctx->extradata[1]= 0;
+    avctx->extradata[2]= 0;
+    avctx->extradata[3]= 0;
+    avctx->extradata[4]= c->imgtype;
+    avctx->extradata[5]= c->compression;
+    avctx->extradata[6]= c->flags;
+    avctx->extradata[7]= CODEC_ZLIB;
     c->avctx->extradata_size= 8;
 
     c->zstream.zalloc = Z_NULL;
@@ -182,19 +165,19 @@ static av_cold int encode_end(AVCodecContext *avctx)
     LclEncContext *c = avctx->priv_data;
 
     av_freep(&avctx->extradata);
-    av_freep(&c->comp_buf);
     deflateEnd(&c->zstream);
 
     return 0;
 }
 
-AVCodec zlib_encoder = {
-    "zlib",
-    CODEC_TYPE_VIDEO,
-    CODEC_ID_ZLIB,
-    sizeof(LclEncContext),
-    encode_init,
-    encode_frame,
-    encode_end,
+AVCodec ff_zlib_encoder = {
+    .name           = "zlib",
+    .type           = AVMEDIA_TYPE_VIDEO,
+    .id             = CODEC_ID_ZLIB,
+    .priv_data_size = sizeof(LclEncContext),
+    .init           = encode_init,
+    .encode         = encode_frame,
+    .close          = encode_end,
+    .pix_fmts = (const enum PixelFormat[]) { PIX_FMT_BGR24, PIX_FMT_NONE },
     .long_name = NULL_IF_CONFIG_SMALL("LCL (LossLess Codec Library) ZLIB"),
 };