Merge remote-tracking branch 'qatar/master'
[ffmpeg.git] / libavcodec / 8bps.c
index 7e6e743..8ae0185 100644 (file)
@@ -2,53 +2,56 @@
  * Quicktime Planar RGB (8BPS) Video Decoder
  * Copyright (C) 2003 Roberto Togni
  *
- * This library is free software; you can redistribute it and/or
+ * 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 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful,
+ * 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 this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /**
- * @file 8bps.c
- * QT 8BPS Video Decoder by Roberto Togni <rtogni at bresciaonline dot it>
+ * @file
+ * QT 8BPS Video Decoder by Roberto Togni
  * For more information about the 8BPS format, visit:
  *   http://www.pcisys.net/~melanson/codecs/
  *
  * Supports: PAL8 (RGB 8bpp, paletted)
- *         : BGR24 (RGB 24bpp) (can also output it as RGBA32)
- *         : RGBA32 (RGB 32bpp, 4th plane is probably alpha and it's ignored)
+ *         : BGR24 (RGB 24bpp) (can also output it as RGB32)
+ *         : RGB32 (RGB 32bpp, 4th plane is probably alpha and it's ignored)
  *
  */
 
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "common.h"
+#include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 
 
-const enum PixelFormat pixfmt_rgb24[] = {PIX_FMT_BGR24, PIX_FMT_RGBA32, -1};
+static const enum PixelFormat pixfmt_rgb24[] = {PIX_FMT_BGR24, PIX_FMT_RGB32, PIX_FMT_NONE};
 
 /*
  * Decoder context
  */
 typedef struct EightBpsContext {
 
-       AVCodecContext *avctx;
-       AVFrame pic;
+        AVCodecContext *avctx;
+        AVFrame pic;
+
+        unsigned char planes;
+        unsigned char planemap[4];
 
-       unsigned char planes;
-       unsigned char planemap[4];
+        uint32_t pal[256];
 } EightBpsContext;
 
 
@@ -57,89 +60,94 @@ typedef struct EightBpsContext {
  * Decode a frame
  *
  */
-static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8_t *buf, int buf_size)
+static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPacket *avpkt)
 {
-       EightBpsContext * const c = (EightBpsContext *)avctx->priv_data;
-       unsigned char *encoded = (unsigned char *)buf;
-       unsigned char *pixptr, *pixptr_end;
-       unsigned int height = avctx->height; // Real image height
-       unsigned int dlen, p, row;
-       unsigned char *lp, *dp;
-       unsigned char count;
-       unsigned int px_inc;
-       unsigned int planes = c->planes;
-       unsigned char *planemap = c->planemap;
-
-       if(c->pic.data[0])
-               avctx->release_buffer(avctx, &c->pic);
-
-       c->pic.reference = 0;
-       c->pic.buffer_hints = FF_BUFFER_HINTS_VALID;
-       if(avctx->get_buffer(avctx, &c->pic) < 0){
-               av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
-               return -1;
-       }
-
-       /* Set data pointer after line lengths */
-       dp = encoded + planes * (height << 1);
-
-       /* Ignore alpha plane, don't know what to do with it */
-       if (planes == 4)
-               planes--;
-
-       px_inc = planes + (avctx->pix_fmt == PIX_FMT_RGBA32);
-
-       for (p = 0; p < planes; p++) {
-               /* Lines length pointer for this plane */
-               lp = encoded + p * (height << 1);
-
-               /* Decode a plane */
-               for(row = 0; row < height; row++) {
-                       pixptr = c->pic.data[0] + row * c->pic.linesize[0] + planemap[p];
-                       pixptr_end = pixptr + c->pic.linesize[0];
-                       dlen = be2me_16(*(unsigned short *)(lp+row*2));
-                       /* Decode a row of this plane */
-                       while(dlen > 0) {
-                               if(dp + 1 >= buf+buf_size) return -1;
-                               if ((count = *dp++) <= 127) {
-                                       count++;
-                                       dlen -= count + 1;
-                                       if (pixptr + count * px_inc > pixptr_end)
-                                           break;
-                                       if(dp + count > buf+buf_size) return -1;
-                                       while(count--) {
-                                               *pixptr = *dp++;
-                                               pixptr += px_inc;
-                                       }
-                               } else {
-                                       count = 257 - count;
-                                       if (pixptr + count * px_inc > pixptr_end)
-                                           break;
-                                       while(count--) {
-                                               *pixptr = *dp;
-                                               pixptr += px_inc;
-                                       }
-                                       dp++;
-                                       dlen -= 2;
-                               }
-                       }
-               }
-       }
-
-       if (avctx->palctrl) {
-               memcpy (c->pic.data[1], avctx->palctrl->palette, AVPALETTE_SIZE);
-               if (avctx->palctrl->palette_changed) {
-                       c->pic.palette_has_changed = 1;
-                       avctx->palctrl->palette_changed = 0;
-               } else
-                       c->pic.palette_has_changed = 0;
-       }
-
-       *data_size = sizeof(AVFrame);
-       *(AVFrame*)data = c->pic;
-
-       /* always report that the buffer was completely consumed */
-       return buf_size;
+        const uint8_t *buf = avpkt->data;
+        int buf_size = avpkt->size;
+        EightBpsContext * const c = avctx->priv_data;
+        const unsigned char *encoded = buf;
+        unsigned char *pixptr, *pixptr_end;
+        unsigned int height = avctx->height; // Real image height
+        unsigned int dlen, p, row;
+        const unsigned char *lp, *dp;
+        unsigned char count;
+        unsigned int px_inc;
+        unsigned int planes = c->planes;
+        unsigned char *planemap = c->planemap;
+
+        if(c->pic.data[0])
+                avctx->release_buffer(avctx, &c->pic);
+
+        c->pic.reference = 0;
+        c->pic.buffer_hints = FF_BUFFER_HINTS_VALID;
+        if(avctx->get_buffer(avctx, &c->pic) < 0){
+                av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
+                return -1;
+        }
+
+        /* Set data pointer after line lengths */
+        dp = encoded + planes * (height << 1);
+
+        /* Ignore alpha plane, don't know what to do with it */
+        if (planes == 4)
+                planes--;
+
+        px_inc = planes + (avctx->pix_fmt == PIX_FMT_RGB32);
+
+        for (p = 0; p < planes; p++) {
+                /* Lines length pointer for this plane */
+                lp = encoded + p * (height << 1);
+
+                /* Decode a plane */
+                for(row = 0; row < height; row++) {
+                        pixptr = c->pic.data[0] + row * c->pic.linesize[0] + planemap[p];
+                        pixptr_end = pixptr + c->pic.linesize[0];
+                        dlen = av_be2ne16(*(const unsigned short *)(lp+row*2));
+                        /* Decode a row of this plane */
+                        while(dlen > 0) {
+                                if(dp + 1 >= buf+buf_size) return -1;
+                                if ((count = *dp++) <= 127) {
+                                        count++;
+                                        dlen -= count + 1;
+                                        if (pixptr + count * px_inc > pixptr_end)
+                                            break;
+                                        if(dp + count > buf+buf_size) return -1;
+                                        while(count--) {
+                                                *pixptr = *dp++;
+                                                pixptr += px_inc;
+                                        }
+                                } else {
+                                        count = 257 - count;
+                                        if (pixptr + count * px_inc > pixptr_end)
+                                            break;
+                                        while(count--) {
+                                                *pixptr = *dp;
+                                                pixptr += px_inc;
+                                        }
+                                        dp++;
+                                        dlen -= 2;
+                                }
+                        }
+                }
+        }
+
+        if (avctx->bits_per_coded_sample <= 8) {
+                const uint8_t *pal = av_packet_get_side_data(avpkt,
+                                                             AV_PKT_DATA_PALETTE,
+                                                             NULL);
+                if (pal) {
+                        c->pic.palette_has_changed = 1;
+                        memcpy(c->pal, pal, AVPALETTE_SIZE);
+                }
+
+                memcpy (c->pic.data[1], c->pal, AVPALETTE_SIZE);
+        }
+
+        *data_size = sizeof(AVFrame);
+        *(AVFrame*)data = c->pic;
+
+        /* always report that the buffer was completely consumed */
+        return buf_size;
 }
 
 
@@ -148,55 +156,47 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8
  * Init 8BPS decoder
  *
  */
-static int decode_init(AVCodecContext *avctx)
+static av_cold int decode_init(AVCodecContext *avctx)
 {
-       EightBpsContext * const c = (EightBpsContext *)avctx->priv_data;
-
-       c->avctx = avctx;
-       avctx->has_b_frames = 0;
-
-       c->pic.data[0] = NULL;
-
-    if (avcodec_check_dimensions(avctx, avctx->width, avctx->height) < 0) {
-        return 1;
-    }
-
-       switch (avctx->bits_per_sample) {
-               case 8:
-                       avctx->pix_fmt = PIX_FMT_PAL8;
-                       c->planes = 1;
-                       c->planemap[0] = 0; // 1st plane is palette indexes
-                       if (avctx->palctrl == NULL) {
-                               av_log(avctx, AV_LOG_ERROR, "Error: PAL8 format but no palette from demuxer.\n");
-                               return -1;
-                       }
-                       break;
-               case 24:
-                       avctx->pix_fmt = avctx->get_format(avctx, pixfmt_rgb24);
-                       c->planes = 3;
-                       c->planemap[0] = 2; // 1st plane is red
-                       c->planemap[1] = 1; // 2nd plane is green
-                       c->planemap[2] = 0; // 3rd plane is blue
-                       break;
-               case 32:
-                       avctx->pix_fmt = PIX_FMT_RGBA32;
-                       c->planes = 4;
-#ifdef WORDS_BIGENDIAN
-                       c->planemap[0] = 1; // 1st plane is red
-                       c->planemap[1] = 2; // 2nd plane is green
-                       c->planemap[2] = 3; // 3rd plane is blue
-                       c->planemap[3] = 0; // 4th plane is alpha???
+        EightBpsContext * const c = avctx->priv_data;
+
+        c->avctx = avctx;
+
+        avcodec_get_frame_defaults(&c->pic);
+        c->pic.data[0] = NULL;
+
+        switch (avctx->bits_per_coded_sample) {
+                case 8:
+                        avctx->pix_fmt = PIX_FMT_PAL8;
+                        c->planes = 1;
+                        c->planemap[0] = 0; // 1st plane is palette indexes
+                        break;
+                case 24:
+                        avctx->pix_fmt = avctx->get_format(avctx, pixfmt_rgb24);
+                        c->planes = 3;
+                        c->planemap[0] = 2; // 1st plane is red
+                        c->planemap[1] = 1; // 2nd plane is green
+                        c->planemap[2] = 0; // 3rd plane is blue
+                        break;
+                case 32:
+                        avctx->pix_fmt = PIX_FMT_RGB32;
+                        c->planes = 4;
+#if HAVE_BIGENDIAN
+                        c->planemap[0] = 1; // 1st plane is red
+                        c->planemap[1] = 2; // 2nd plane is green
+                        c->planemap[2] = 3; // 3rd plane is blue
+                        c->planemap[3] = 0; // 4th plane is alpha???
 #else
-                       c->planemap[0] = 2; // 1st plane is red
-                       c->planemap[1] = 1; // 2nd plane is green
-                       c->planemap[2] = 0; // 3rd plane is blue
-                       c->planemap[3] = 3; // 4th plane is alpha???
+                        c->planemap[0] = 2; // 1st plane is red
+                        c->planemap[1] = 1; // 2nd plane is green
+                        c->planemap[2] = 0; // 3rd plane is blue
+                        c->planemap[3] = 3; // 4th plane is alpha???
 #endif
-                       break;
-               default:
-                       av_log(avctx, AV_LOG_ERROR, "Error: Unsupported color depth: %u.\n", avctx->bits_per_sample);
-                       return -1;
-       }
+                        break;
+                default:
+                        av_log(avctx, AV_LOG_ERROR, "Error: Unsupported color depth: %u.\n", avctx->bits_per_coded_sample);
+                        return -1;
+        }
 
   return 0;
 }
@@ -209,26 +209,26 @@ static int decode_init(AVCodecContext *avctx)
  * Uninit 8BPS decoder
  *
  */
-static int decode_end(AVCodecContext *avctx)
+static av_cold int decode_end(AVCodecContext *avctx)
 {
-       EightBpsContext * const c = (EightBpsContext *)avctx->priv_data;
+        EightBpsContext * const c = avctx->priv_data;
 
-       if (c->pic.data[0])
-               avctx->release_buffer(avctx, &c->pic);
+        if (c->pic.data[0])
+                avctx->release_buffer(avctx, &c->pic);
 
-       return 0;
+        return 0;
 }
 
 
 
-AVCodec eightbps_decoder = {
-       "8bps",
-       CODEC_TYPE_VIDEO,
-       CODEC_ID_8BPS,
-       sizeof(EightBpsContext),
-       decode_init,
-       NULL,
-       decode_end,
-       decode_frame,
-       CODEC_CAP_DR1,
+AVCodec ff_eightbps_decoder = {
+    .name           = "8bps",
+    .type           = AVMEDIA_TYPE_VIDEO,
+    .id             = CODEC_ID_8BPS,
+    .priv_data_size = sizeof(EightBpsContext),
+    .init           = decode_init,
+    .close          = decode_end,
+    .decode         = decode_frame,
+    .capabilities   = CODEC_CAP_DR1,
+    .long_name      = NULL_IF_CONFIG_SMALL("QuickTime 8BPS video"),
 };