X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fqpeg.c;h=2f1b7434f2d884070134ca7ade6113eee3a8eba8;hb=37ddd3833219fa7b913fff3f5cccc6878b047e6b;hp=56a8d0e0d744c4fae1a4474d0353c64311be449c;hpb=115329f16062074e11ccf3b89ead6176606c9696;p=ffmpeg

diff --git a/libavcodec/qpeg.c b/libavcodec/qpeg.c
index 56a8d0e0d74..2f1b7434f2d 100644
--- a/libavcodec/qpeg.c
+++ b/libavcodec/qpeg.c
@@ -2,38 +2,41 @@
  * QPEG codec
  * Copyright (c) 2004 Konstantin Shishkov
  *
- * This library is free software; you can redistribute it and/or
+ * 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 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,
+ * 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 this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /**
- * @file qpeg.c
+ * @file
  * QPEG codec.
  */
 
 #include "avcodec.h"
-#include "mpegvideo.h"
+#include "bytestream.h"
 
 typedef struct QpegContext{
     AVCodecContext *avctx;
     AVFrame pic;
     uint8_t *refdata;
+    uint32_t pal[256];
+    GetByteContext buffer;
 } QpegContext;
 
-static void qpeg_decode_intra(uint8_t *src, uint8_t *dst, int size,
-			    int stride, int width, int height)
+static void qpeg_decode_intra(QpegContext *qctx, uint8_t *dst,
+                              int stride, int width, int height)
 {
     int i;
     int code;
@@ -46,124 +49,114 @@ static void qpeg_decode_intra(uint8_t *src, uint8_t *dst, int size,
     height--;
     dst = dst + height * stride;
 
-    while((size > 0) && (rows_to_go > 0)) {
-	code = *src++;
-	size--;
-	run = copy = 0;
-	if(code == 0xFC) /* end-of-picture code */
-	    break;
-	if(code >= 0xF8) { /* very long run */
-	    c0 = *src++;
-	    c1 = *src++;
-	    size -= 2;
-	    run = ((code & 0x7) << 16) + (c0 << 8) + c1 + 2;
-	} else if (code >= 0xF0) { /* long run */
-	    c0 = *src++;
-	    size--;
-	    run = ((code & 0xF) << 8) + c0 + 2;
-	} else if (code >= 0xE0) { /* short run */
-	    run = (code & 0x1F) + 2;
-	} else if (code >= 0xC0) { /* very long copy */
-	    c0 = *src++;
-	    c1 = *src++;
-	    size -= 2;
-	    copy = ((code & 0x3F) << 16) + (c0 << 8) + c1 + 1;
-	} else if (code >= 0x80) { /* long copy */
-	    c0 = *src++;
-	    size--;
-	    copy = ((code & 0x7F) << 8) + c0 + 1;
-	} else { /* short copy */
-	    copy = code + 1;
-	}
-
-	/* perform actual run or copy */
-	if(run) {
-	    int p;
-
-	    p = *src++;
-	    size--;
-	    for(i = 0; i < run; i++) {
-		dst[filled++] = p;
-		if (filled >= width) {
-		    filled = 0;
-		    dst -= stride;
+    while ((bytestream2_get_bytes_left(&qctx->buffer) > 0) && (rows_to_go > 0)) {
+        code = bytestream2_get_byte(&qctx->buffer);
+        run = copy = 0;
+        if(code == 0xFC) /* end-of-picture code */
+            break;
+        if(code >= 0xF8) { /* very long run */
+            c0 = bytestream2_get_byte(&qctx->buffer);
+            c1 = bytestream2_get_byte(&qctx->buffer);
+            run = ((code & 0x7) << 16) + (c0 << 8) + c1 + 2;
+        } else if (code >= 0xF0) { /* long run */
+            c0 = bytestream2_get_byte(&qctx->buffer);
+            run = ((code & 0xF) << 8) + c0 + 2;
+        } else if (code >= 0xE0) { /* short run */
+            run = (code & 0x1F) + 2;
+        } else if (code >= 0xC0) { /* very long copy */
+            c0 = bytestream2_get_byte(&qctx->buffer);
+            c1 = bytestream2_get_byte(&qctx->buffer);
+            copy = ((code & 0x3F) << 16) + (c0 << 8) + c1 + 1;
+        } else if (code >= 0x80) { /* long copy */
+            c0 = bytestream2_get_byte(&qctx->buffer);
+            copy = ((code & 0x7F) << 8) + c0 + 1;
+        } else { /* short copy */
+            copy = code + 1;
+        }
+
+        /* perform actual run or copy */
+        if(run) {
+            int p;
+
+            p = bytestream2_get_byte(&qctx->buffer);
+            for(i = 0; i < run; i++) {
+                dst[filled++] = p;
+                if (filled >= width) {
+                    filled = 0;
+                    dst -= stride;
                     rows_to_go--;
                     if(rows_to_go <= 0)
                         break;
-		}
-	    }
-	} else {
-            size -= copy;
-	    for(i = 0; i < copy; i++) {
-		dst[filled++] = *src++;
-		if (filled >= width) {
-		    filled = 0;
-		    dst -= stride;
+                }
+            }
+        } else {
+            for(i = 0; i < copy; i++) {
+                dst[filled++] = bytestream2_get_byte(&qctx->buffer);
+                if (filled >= width) {
+                    filled = 0;
+                    dst -= stride;
                     rows_to_go--;
                     if(rows_to_go <= 0)
                         break;
-		}
-	    }
-	}
+                }
+            }
+        }
     }
 }
 
-static int qpeg_table_h[16] =
+static const int qpeg_table_h[16] =
  { 0x00, 0x20, 0x20, 0x20, 0x18, 0x10, 0x10, 0x20, 0x10, 0x08, 0x18, 0x08, 0x08, 0x18, 0x10, 0x04};
-static int qpeg_table_w[16] =
+static const int qpeg_table_w[16] =
  { 0x00, 0x20, 0x18, 0x08, 0x18, 0x10, 0x20, 0x10, 0x08, 0x10, 0x20, 0x20, 0x08, 0x10, 0x18, 0x04};
 
 /* Decodes delta frames */
-static void qpeg_decode_inter(uint8_t *src, uint8_t *dst, int size,
-			    int stride, int width, int height,
-			    int delta, uint8_t *ctable, uint8_t *refdata)
+static void qpeg_decode_inter(QpegContext *qctx, uint8_t *dst,
+                              int stride, int width, int height,
+                              int delta, const uint8_t *ctable,
+                              uint8_t *refdata)
 {
     int i, j;
     int code;
     int filled = 0;
     int orig_height;
-    uint8_t *blkdata;
 
     /* copy prev frame */
     for(i = 0; i < height; i++)
-	memcpy(refdata + (i * width), dst + (i * stride), width);
+        memcpy(refdata + (i * width), dst + (i * stride), width);
 
     orig_height = height;
-    blkdata = src - 0x86;
     height--;
     dst = dst + height * stride;
 
-    while((size > 0) && (height >= 0)) {
-	code = *src++;
-	size--;
-
-	if(delta) {
-	    /* motion compensation */
-	    while((code & 0xF0) == 0xF0) {
-		if(delta == 1) {
-		    int me_idx;
-		    int me_w, me_h, me_x, me_y;
-		    uint8_t *me_plane;
-		    int corr, val;
-
-		    /* get block size by index */
-		    me_idx = code & 0xF;
-		    me_w = qpeg_table_w[me_idx];
-		    me_h = qpeg_table_h[me_idx];
-
-		    /* extract motion vector */
-		    corr = *src++;
-		    size--;
-
-		    val = corr >> 4;
-		    if(val > 7)
-			val -= 16;
-		    me_x = val;
-
-		    val = corr & 0xF;
-		    if(val > 7)
-			val -= 16;
-		    me_y = val;
+    while ((bytestream2_get_bytes_left(&qctx->buffer) > 0) && (height >= 0)) {
+        code = bytestream2_get_byte(&qctx->buffer);
+
+        if(delta) {
+            /* motion compensation */
+            while((code & 0xF0) == 0xF0) {
+                if(delta == 1) {
+                    int me_idx;
+                    int me_w, me_h, me_x, me_y;
+                    uint8_t *me_plane;
+                    int corr, val;
+
+                    /* get block size by index */
+                    me_idx = code & 0xF;
+                    me_w = qpeg_table_w[me_idx];
+                    me_h = qpeg_table_h[me_idx];
+
+                    /* extract motion vector */
+                    corr = bytestream2_get_byte(&qctx->buffer);
+
+                    val = corr >> 4;
+                    if(val > 7)
+                        val -= 16;
+                    me_x = val;
+
+                    val = corr & 0xF;
+                    if(val > 7)
+                        val -= 16;
+                    me_y = val;
 
                     /* check motion vector */
                     if ((me_x + filled < 0) || (me_x + me_w + filled > width) ||
@@ -178,129 +171,134 @@ static void qpeg_decode_inter(uint8_t *src, uint8_t *dst, int size,
                             for(i = 0; i < me_w; i++)
                                 dst[filled + i - (j * stride)] = me_plane[i - (j * width)];
                         }
-		    }
-		}
-		code = *src++;
-		size--;
-	    }
-	}
-
-	if(code == 0xE0) /* end-of-picture code */
-	    break;
-	if(code > 0xE0) { /* run code: 0xE1..0xFF */
-	    int p;
-
-	    code &= 0x1F;
-	    p = *src++;
-	    size--;
-	    for(i = 0; i <= code; i++) {
-		dst[filled++] = p;
-		if(filled >= width) {
-		    filled = 0;
-		    dst -= stride;
-		    height--;
-		}
-	    }
-	} else if(code >= 0xC0) { /* copy code: 0xC0..0xDF */
-	    code &= 0x1F;
-
-	    for(i = 0; i <= code; i++) {
-		dst[filled++] = *src++;
-		if(filled >= width) {
-		    filled = 0;
-		    dst -= stride;
-		    height--;
-		}
-	    }
-	    size -= code + 1;
-	} else if(code >= 0x80) { /* skip code: 0x80..0xBF */
-	    int skip;
-
-	    code &= 0x3F;
-	    /* codes 0x80 and 0x81 are actually escape codes,
-	       skip value minus constant is in the next byte */
-	    if(!code)
-		skip = (*src++) + 64;
-	    else if(code == 1)
-		skip = (*src++) + 320;
-	    else
-		skip = code;
-	    filled += skip;
-	    while( filled >= width) {
-		filled -= width;
-		dst -= stride;
-		height--;
+                    }
+                }
+                code = bytestream2_get_byte(&qctx->buffer);
+            }
+        }
+
+        if(code == 0xE0) /* end-of-picture code */
+            break;
+        if(code > 0xE0) { /* run code: 0xE1..0xFF */
+            int p;
+
+            code &= 0x1F;
+            p = bytestream2_get_byte(&qctx->buffer);
+            for(i = 0; i <= code; i++) {
+                dst[filled++] = p;
+                if(filled >= width) {
+                    filled = 0;
+                    dst -= stride;
+                    height--;
+                }
+            }
+        } else if(code >= 0xC0) { /* copy code: 0xC0..0xDF */
+            code &= 0x1F;
+
+            for(i = 0; i <= code; i++) {
+                dst[filled++] = bytestream2_get_byte(&qctx->buffer);
+                if(filled >= width) {
+                    filled = 0;
+                    dst -= stride;
+                    height--;
+                }
+            }
+        } else if(code >= 0x80) { /* skip code: 0x80..0xBF */
+            int skip;
+
+            code &= 0x3F;
+            /* codes 0x80 and 0x81 are actually escape codes,
+               skip value minus constant is in the next byte */
+            if(!code)
+                skip = bytestream2_get_byte(&qctx->buffer) +  64;
+            else if(code == 1)
+                skip = bytestream2_get_byte(&qctx->buffer) + 320;
+            else
+                skip = code;
+            filled += skip;
+            while( filled >= width) {
+                filled -= width;
+                dst -= stride;
+                height--;
                 if(height < 0)
                     break;
-	    }
-	} else {
-	    /* zero code treated as one-pixel skip */
-	    if(code)
-		dst[filled++] = ctable[code & 0x7F];
-	    else
-		filled++;
-	    if(filled >= width) {
-		filled = 0;
-		dst -= stride;
-		height--;
-	    }
-	}
+            }
+        } else {
+            /* zero code treated as one-pixel skip */
+            if(code) {
+                dst[filled++] = ctable[code & 0x7F];
+            }
+            else
+                filled++;
+            if(filled >= width) {
+                filled = 0;
+                dst -= stride;
+                height--;
+            }
+        }
     }
 }
 
 static int decode_frame(AVCodecContext *avctx,
                         void *data, int *data_size,
-                        uint8_t *buf, int buf_size)
+                        AVPacket *avpkt)
 {
+    uint8_t ctable[128];
     QpegContext * const a = avctx->priv_data;
-    AVFrame * const p= (AVFrame*)&a->pic;
+    AVFrame * const p = &a->pic;
     uint8_t* outdata;
     int delta;
+    const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, NULL);
 
-    if(p->data[0])
-        avctx->release_buffer(avctx, p);
+    if (avpkt->size < 0x86) {
+        av_log(avctx, AV_LOG_ERROR, "Packet is too small\n");
+        return AVERROR_INVALIDDATA;
+    }
 
-    p->reference= 0;
-    if(avctx->get_buffer(avctx, p) < 0){
-        av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
+    bytestream2_init(&a->buffer, avpkt->data, avpkt->size);
+    p->reference = 3;
+    if (avctx->reget_buffer(avctx, p) < 0) {
+        av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
         return -1;
     }
     outdata = a->pic.data[0];
-    if(buf[0x85] == 0x10) {
-	qpeg_decode_intra(buf+0x86, outdata, buf_size - 0x86, a->pic.linesize[0], avctx->width, avctx->height);
+    bytestream2_skip(&a->buffer, 4);
+    bytestream2_get_buffer(&a->buffer, ctable, 128);
+    bytestream2_skip(&a->buffer, 1);
+
+    delta = bytestream2_get_byte(&a->buffer);
+    if(delta == 0x10) {
+        qpeg_decode_intra(a, outdata, a->pic.linesize[0], avctx->width, avctx->height);
     } else {
-	delta = buf[0x85];
-	qpeg_decode_inter(buf+0x86, outdata, buf_size - 0x86, a->pic.linesize[0], avctx->width, avctx->height, delta, buf + 4, a->refdata);
+        qpeg_decode_inter(a, outdata, a->pic.linesize[0], avctx->width, avctx->height, delta, ctable, a->refdata);
     }
 
     /* make the palette available on the way out */
-    memcpy(a->pic.data[1], a->avctx->palctrl->palette, AVPALETTE_SIZE);
-    if (a->avctx->palctrl->palette_changed) {
+    if (pal) {
         a->pic.palette_has_changed = 1;
-        a->avctx->palctrl->palette_changed = 0;
+        memcpy(a->pal, pal, AVPALETTE_SIZE);
     }
+    memcpy(a->pic.data[1], a->pal, AVPALETTE_SIZE);
 
     *data_size = sizeof(AVFrame);
     *(AVFrame*)data = a->pic;
 
-    return buf_size;
+    return avpkt->size;
 }
 
-static int decode_init(AVCodecContext *avctx){
+static av_cold int decode_init(AVCodecContext *avctx){
     QpegContext * const a = avctx->priv_data;
 
     a->avctx = avctx;
     avctx->pix_fmt= PIX_FMT_PAL8;
-    avctx->has_b_frames = 0;
-    a->pic.data[0] = NULL;
     a->refdata = av_malloc(avctx->width * avctx->height);
 
     return 0;
 }
 
-static int decode_end(AVCodecContext *avctx){
+static av_cold int decode_end(AVCodecContext *avctx){
     QpegContext * const a = avctx->priv_data;
-    AVFrame * const p= (AVFrame*)&a->pic;
+    AVFrame * const p = &a->pic;
 
     if(p->data[0])
         avctx->release_buffer(avctx, p);
@@ -309,14 +307,14 @@ static int decode_end(AVCodecContext *avctx){
     return 0;
 }
 
-AVCodec qpeg_decoder = {
-    "qpeg",
-    CODEC_TYPE_VIDEO,
-    CODEC_ID_QPEG,
-    sizeof(QpegContext),
-    decode_init,
-    NULL,
-    decode_end,
-    decode_frame,
-    CODEC_CAP_DR1,
+AVCodec ff_qpeg_decoder = {
+    .name           = "qpeg",
+    .type           = AVMEDIA_TYPE_VIDEO,
+    .id             = CODEC_ID_QPEG,
+    .priv_data_size = sizeof(QpegContext),
+    .init           = decode_init,
+    .close          = decode_end,
+    .decode         = decode_frame,
+    .capabilities   = CODEC_CAP_DR1,
+    .long_name      = NULL_IF_CONFIG_SMALL("Q-team QPEG"),
 };