Get rid of some pointless '== NULL' / '!= 0' conditions in if statements.

[ffmpeg] / libavcodec / lclenc.c

diff --git a/libavcodec/lclenc.c b/libavcodec/lclenc.c
index 2d89998c07ad42180f05da61faf2081849f4456c..4c43916fd195220484bee573cf8e83fb5d4059da 100644 (file)
--- a/libavcodec/lclenc.c
+++ b/libavcodec/lclenc.c
@@ -20,7 +20,7 @@
  */
 
 /**
- * @file lcl.c
+ * @file libavcodec/lclenc.c
  * LCL (LossLess Codec Library) Video Codec
  * Decoder for MSZH and ZLIB codecs
  * Experimental encoder for ZLIB RGB24
@@ -42,21 +42,17 @@
 #include <stdlib.h>
 
 #include "avcodec.h"
-#include "bitstream.h"
 #include "lcl.h"
 
-#ifdef CONFIG_ZLIB
 #include <zlib.h>
-#endif
 
 /*
  * Decoder context
  */
 typedef struct LclEncContext {
 
-        AVCodecContext *avctx;
-        AVFrame pic;
-    PutBitContext pb;
+    AVCodecContext *avctx;
+    AVFrame pic;
 
     // Image type
     int imgtype;
@@ -64,15 +60,7 @@ 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;
-#ifdef CONFIG_ZLIB
     z_stream zstream;
-#endif
 } LclEncContext;
 
 /*
@@ -87,13 +75,6 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size,
     int i;
     int zret; // Zlib return code
 
-#ifndef CONFIG_ZLIB
-    av_log(avctx, AV_LOG_ERROR, "Zlib support not compiled in.\n");
-    return -1;
-#else
-
-    init_put_bits(&c->pb, buf, buf_size);
-
     *p = *pict;
     p->pict_type= FF_I_TYPE;
     p->key_frame= 1;
@@ -103,35 +84,30 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size,
         return -1;
     }
 
-    zret = deflateReset(&(c->zstream));
+    zret = deflateReset(&c->zstream);
     if (zret != Z_OK) {
         av_log(avctx, AV_LOG_ERROR, "Deflate reset error: %d\n", zret);
         return -1;
     }
-    c->zstream.next_out = c->comp_buf;
-    c->zstream.avail_out = c->max_comp_size;
+    c->zstream.next_out = buf;
+    c->zstream.avail_out = buf_size;
 
     for(i = avctx->height - 1; i >= 0; i--) {
         c->zstream.next_in = p->data[0]+p->linesize[0]*i;
         c->zstream.avail_in = avctx->width*3;
-        zret = deflate(&(c->zstream), Z_NO_FLUSH);
+        zret = deflate(&c->zstream, Z_NO_FLUSH);
         if (zret != Z_OK) {
             av_log(avctx, AV_LOG_ERROR, "Deflate error: %d\n", zret);
             return -1;
         }
     }
-    zret = deflate(&(c->zstream), Z_FINISH);
+    zret = deflate(&c->zstream, Z_FINISH);
     if (zret != Z_STREAM_END) {
         av_log(avctx, AV_LOG_ERROR, "Deflate error: %d\n", zret);
         return -1;
     }
 
-    for (i = 0; i < c->zstream.total_out; i++)
-        put_bits(&c->pb, 8, c->comp_buf[i]);
-    flush_put_bits(&c->pb);
-
     return c->zstream.total_out;
-#endif
 }
 
 /*
@@ -144,11 +120,6 @@ static av_cold int encode_init(AVCodecContext *avctx)
     LclEncContext *c = avctx->priv_data;
     int zret; // Zlib return code
 
-#ifndef CONFIG_ZLIB
-    av_log(avctx, AV_LOG_ERROR, "Zlib support not compiled.\n");
-    return 1;
-#else
-
     c->avctx= avctx;
 
     assert(avctx->width && avctx->height);
@@ -163,43 +134,33 @@ static av_cold int encode_init(AVCodecContext *avctx)
     switch(avctx->pix_fmt){
         case PIX_FMT_BGR24:
             c->imgtype = IMGTYPE_RGB24;
-            c->decomp_size = avctx->width * avctx->height * 3;
-            avctx->bits_per_sample= 24;
+            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;
+    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;
     c->zstream.zfree = Z_NULL;
     c->zstream.opaque = Z_NULL;
-    zret = deflateInit(&(c->zstream), c->compression);
+    zret = deflateInit(&c->zstream, c->compression);
     if (zret != Z_OK) {
         av_log(avctx, AV_LOG_ERROR, "Deflate init error: %d\n", zret);
         return 1;
     }
 
-        /* Conservative upper bound taken from zlib v1.2.1 source */
-        c->max_comp_size = c->decomp_size + ((c->decomp_size + 7) >> 3) +
-                           ((c->decomp_size + 63) >> 6) + 11;
-    if ((c->comp_buf = av_malloc(c->max_comp_size)) == NULL) {
-        av_log(avctx, AV_LOG_ERROR, "Can't allocate compression buffer.\n");
-        return 1;
-    }
-
     return 0;
-#endif
 }
 
 /*
@@ -212,10 +173,7 @@ static av_cold int encode_end(AVCodecContext *avctx)
     LclEncContext *c = avctx->priv_data;
 
     av_freep(&avctx->extradata);
-    av_freep(&c->comp_buf);
-#ifdef CONFIG_ZLIB
-    deflateEnd(&(c->zstream));
-#endif
+    deflateEnd(&c->zstream);
 
     return 0;
 }