X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fcinepak.c;h=caf14cbfcf536fa6255e0755e846d07a7cdc399c;hb=6996fd204a7f28b46a8c3c97bcf223998218c743;hp=9c29f5e5e3ddb3ddfd11ae3a6ae25b9dc634cd41;hpb=36ef5369ee9b336febc2c270f8718cec4476cb85;p=ffmpeg

diff --git a/libavcodec/cinepak.c b/libavcodec/cinepak.c
index 9c29f5e5e3d..caf14cbfcf5 100644
--- a/libavcodec/cinepak.c
+++ b/libavcodec/cinepak.c
@@ -34,8 +34,10 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "libavutil/common.h"
 #include "libavutil/intreadwrite.h"
 #include "avcodec.h"
+#include "internal.h"
 
 
 typedef struct {
@@ -56,7 +58,7 @@ typedef struct {
 typedef struct CinepakContext {
 
     AVCodecContext *avctx;
-    AVFrame frame;
+    AVFrame *frame;
 
     const unsigned char *data;
     int size;
@@ -136,14 +138,14 @@ static int cinepak_decode_vectors (CinepakContext *s, cvid_strip *strip,
 
     for (y=strip->y1; y < strip->y2; y+=4) {
 
-        iy[0] = strip->x1 + (y * s->frame.linesize[0]);
-        iy[1] = iy[0] + s->frame.linesize[0];
-        iy[2] = iy[1] + s->frame.linesize[0];
-        iy[3] = iy[2] + s->frame.linesize[0];
-        iu[0] = (strip->x1/2) + ((y/2) * s->frame.linesize[1]);
-        iu[1] = iu[0] + s->frame.linesize[1];
-        iv[0] = (strip->x1/2) + ((y/2) * s->frame.linesize[2]);
-        iv[1] = iv[0] + s->frame.linesize[2];
+        iy[0] = strip->x1 + (y * s->frame->linesize[0]);
+        iy[1] = iy[0] + s->frame->linesize[0];
+        iy[2] = iy[1] + s->frame->linesize[0];
+        iy[3] = iy[2] + s->frame->linesize[0];
+        iu[0] = (strip->x1/2) + ((y/2) * s->frame->linesize[1]);
+        iu[1] = iu[0] + s->frame->linesize[1];
+        iv[0] = (strip->x1/2) + ((y/2) * s->frame->linesize[2]);
+        iv[1] = iv[0] + s->frame->linesize[2];
 
         for (x=strip->x1; x < strip->x2; x+=4) {
             if ((chunk_id & 0x01) && !(mask >>= 1)) {
@@ -170,40 +172,40 @@ static int cinepak_decode_vectors (CinepakContext *s, cvid_strip *strip,
                         return AVERROR_INVALIDDATA;
 
                     codebook = &strip->v1_codebook[*data++];
-                    s->frame.data[0][iy[0] + 0] = codebook->y0;
-                    s->frame.data[0][iy[0] + 1] = codebook->y0;
-                    s->frame.data[0][iy[1] + 0] = codebook->y0;
-                    s->frame.data[0][iy[1] + 1] = codebook->y0;
+                    s->frame->data[0][iy[0] + 0] = codebook->y0;
+                    s->frame->data[0][iy[0] + 1] = codebook->y0;
+                    s->frame->data[0][iy[1] + 0] = codebook->y0;
+                    s->frame->data[0][iy[1] + 1] = codebook->y0;
                     if (!s->palette_video) {
-                        s->frame.data[1][iu[0]] = codebook->u;
-                        s->frame.data[2][iv[0]] = codebook->v;
+                        s->frame->data[1][iu[0]] = codebook->u;
+                        s->frame->data[2][iv[0]] = codebook->v;
                     }
 
-                    s->frame.data[0][iy[0] + 2] = codebook->y1;
-                    s->frame.data[0][iy[0] + 3] = codebook->y1;
-                    s->frame.data[0][iy[1] + 2] = codebook->y1;
-                    s->frame.data[0][iy[1] + 3] = codebook->y1;
+                    s->frame->data[0][iy[0] + 2] = codebook->y1;
+                    s->frame->data[0][iy[0] + 3] = codebook->y1;
+                    s->frame->data[0][iy[1] + 2] = codebook->y1;
+                    s->frame->data[0][iy[1] + 3] = codebook->y1;
                     if (!s->palette_video) {
-                        s->frame.data[1][iu[0] + 1] = codebook->u;
-                        s->frame.data[2][iv[0] + 1] = codebook->v;
+                        s->frame->data[1][iu[0] + 1] = codebook->u;
+                        s->frame->data[2][iv[0] + 1] = codebook->v;
                     }
 
-                    s->frame.data[0][iy[2] + 0] = codebook->y2;
-                    s->frame.data[0][iy[2] + 1] = codebook->y2;
-                    s->frame.data[0][iy[3] + 0] = codebook->y2;
-                    s->frame.data[0][iy[3] + 1] = codebook->y2;
+                    s->frame->data[0][iy[2] + 0] = codebook->y2;
+                    s->frame->data[0][iy[2] + 1] = codebook->y2;
+                    s->frame->data[0][iy[3] + 0] = codebook->y2;
+                    s->frame->data[0][iy[3] + 1] = codebook->y2;
                     if (!s->palette_video) {
-                        s->frame.data[1][iu[1]] = codebook->u;
-                        s->frame.data[2][iv[1]] = codebook->v;
+                        s->frame->data[1][iu[1]] = codebook->u;
+                        s->frame->data[2][iv[1]] = codebook->v;
                     }
 
-                    s->frame.data[0][iy[2] + 2] = codebook->y3;
-                    s->frame.data[0][iy[2] + 3] = codebook->y3;
-                    s->frame.data[0][iy[3] + 2] = codebook->y3;
-                    s->frame.data[0][iy[3] + 3] = codebook->y3;
+                    s->frame->data[0][iy[2] + 2] = codebook->y3;
+                    s->frame->data[0][iy[2] + 3] = codebook->y3;
+                    s->frame->data[0][iy[3] + 2] = codebook->y3;
+                    s->frame->data[0][iy[3] + 3] = codebook->y3;
                     if (!s->palette_video) {
-                        s->frame.data[1][iu[1] + 1] = codebook->u;
-                        s->frame.data[2][iv[1] + 1] = codebook->v;
+                        s->frame->data[1][iu[1] + 1] = codebook->u;
+                        s->frame->data[2][iv[1] + 1] = codebook->v;
                     }
 
                 } else if (flag & mask) {
@@ -211,43 +213,43 @@ static int cinepak_decode_vectors (CinepakContext *s, cvid_strip *strip,
                         return AVERROR_INVALIDDATA;
 
                     codebook = &strip->v4_codebook[*data++];
-                    s->frame.data[0][iy[0] + 0] = codebook->y0;
-                    s->frame.data[0][iy[0] + 1] = codebook->y1;
-                    s->frame.data[0][iy[1] + 0] = codebook->y2;
-                    s->frame.data[0][iy[1] + 1] = codebook->y3;
+                    s->frame->data[0][iy[0] + 0] = codebook->y0;
+                    s->frame->data[0][iy[0] + 1] = codebook->y1;
+                    s->frame->data[0][iy[1] + 0] = codebook->y2;
+                    s->frame->data[0][iy[1] + 1] = codebook->y3;
                     if (!s->palette_video) {
-                        s->frame.data[1][iu[0]] = codebook->u;
-                        s->frame.data[2][iv[0]] = codebook->v;
+                        s->frame->data[1][iu[0]] = codebook->u;
+                        s->frame->data[2][iv[0]] = codebook->v;
                     }
 
                     codebook = &strip->v4_codebook[*data++];
-                    s->frame.data[0][iy[0] + 2] = codebook->y0;
-                    s->frame.data[0][iy[0] + 3] = codebook->y1;
-                    s->frame.data[0][iy[1] + 2] = codebook->y2;
-                    s->frame.data[0][iy[1] + 3] = codebook->y3;
+                    s->frame->data[0][iy[0] + 2] = codebook->y0;
+                    s->frame->data[0][iy[0] + 3] = codebook->y1;
+                    s->frame->data[0][iy[1] + 2] = codebook->y2;
+                    s->frame->data[0][iy[1] + 3] = codebook->y3;
                     if (!s->palette_video) {
-                        s->frame.data[1][iu[0] + 1] = codebook->u;
-                        s->frame.data[2][iv[0] + 1] = codebook->v;
+                        s->frame->data[1][iu[0] + 1] = codebook->u;
+                        s->frame->data[2][iv[0] + 1] = codebook->v;
                     }
 
                     codebook = &strip->v4_codebook[*data++];
-                    s->frame.data[0][iy[2] + 0] = codebook->y0;
-                    s->frame.data[0][iy[2] + 1] = codebook->y1;
-                    s->frame.data[0][iy[3] + 0] = codebook->y2;
-                    s->frame.data[0][iy[3] + 1] = codebook->y3;
+                    s->frame->data[0][iy[2] + 0] = codebook->y0;
+                    s->frame->data[0][iy[2] + 1] = codebook->y1;
+                    s->frame->data[0][iy[3] + 0] = codebook->y2;
+                    s->frame->data[0][iy[3] + 1] = codebook->y3;
                     if (!s->palette_video) {
-                        s->frame.data[1][iu[1]] = codebook->u;
-                        s->frame.data[2][iv[1]] = codebook->v;
+                        s->frame->data[1][iu[1]] = codebook->u;
+                        s->frame->data[2][iv[1]] = codebook->v;
                     }
 
                     codebook = &strip->v4_codebook[*data++];
-                    s->frame.data[0][iy[2] + 2] = codebook->y0;
-                    s->frame.data[0][iy[2] + 3] = codebook->y1;
-                    s->frame.data[0][iy[3] + 2] = codebook->y2;
-                    s->frame.data[0][iy[3] + 3] = codebook->y3;
+                    s->frame->data[0][iy[2] + 2] = codebook->y0;
+                    s->frame->data[0][iy[2] + 3] = codebook->y1;
+                    s->frame->data[0][iy[3] + 2] = codebook->y2;
+                    s->frame->data[0][iy[3] + 3] = codebook->y3;
                     if (!s->palette_video) {
-                        s->frame.data[1][iu[1] + 1] = codebook->u;
-                        s->frame.data[2][iv[1] + 1] = codebook->v;
+                        s->frame->data[1][iu[1] + 1] = codebook->u;
+                        s->frame->data[2][iv[1] + 1] = codebook->v;
                     }
 
                 }
@@ -332,8 +334,8 @@ static int cinepak_decode (CinepakContext *s)
     /* if this is the first frame, check for deviant Sega FILM data */
     if (s->sega_film_skip_bytes == -1) {
         if (!encoded_buf_size) {
-            av_log_ask_for_sample(s->avctx, "encoded_buf_size is 0");
-            return AVERROR_INVALIDDATA;
+            avpriv_request_sample(s->avctx, "encoded_buf_size 0");
+            return AVERROR_PATCHWELCOME;
         }
         if (encoded_buf_size != s->size && (s->size % encoded_buf_size) != 0) {
             /* If the encoded frame size differs from the frame size as indicated
@@ -406,19 +408,21 @@ static av_cold int cinepak_decode_init(AVCodecContext *avctx)
     // check for paletted data
     if (avctx->bits_per_coded_sample != 8) {
         s->palette_video = 0;
-        avctx->pix_fmt = PIX_FMT_YUV420P;
+        avctx->pix_fmt = AV_PIX_FMT_YUV420P;
     } else {
         s->palette_video = 1;
-        avctx->pix_fmt = PIX_FMT_PAL8;
+        avctx->pix_fmt = AV_PIX_FMT_PAL8;
     }
 
-    s->frame.data[0] = NULL;
+    s->frame = av_frame_alloc();
+    if (!s->frame)
+        return AVERROR(ENOMEM);
 
     return 0;
 }
 
 static int cinepak_decode_frame(AVCodecContext *avctx,
-                                void *data, int *data_size,
+                                void *data, int *got_frame,
                                 AVPacket *avpkt)
 {
     const uint8_t *buf = avpkt->data;
@@ -428,10 +432,7 @@ static int cinepak_decode_frame(AVCodecContext *avctx,
     s->data = buf;
     s->size = buf_size;
 
-    s->frame.reference = 1;
-    s->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE |
-                            FF_BUFFER_HINTS_REUSABLE;
-    if ((ret = avctx->reget_buffer(avctx, &s->frame))) {
+    if ((ret = ff_reget_buffer(avctx, s->frame))) {
         av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
         return ret;
     }
@@ -439,7 +440,7 @@ static int cinepak_decode_frame(AVCodecContext *avctx,
     if (s->palette_video) {
         const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, NULL);
         if (pal) {
-            s->frame.palette_has_changed = 1;
+            s->frame->palette_has_changed = 1;
             memcpy(s->pal, pal, AVPALETTE_SIZE);
         }
     }
@@ -447,10 +448,12 @@ static int cinepak_decode_frame(AVCodecContext *avctx,
     cinepak_decode(s);
 
     if (s->palette_video)
-        memcpy (s->frame.data[1], s->pal, AVPALETTE_SIZE);
+        memcpy (s->frame->data[1], s->pal, AVPALETTE_SIZE);
+
+    if ((ret = av_frame_ref(data, s->frame)) < 0)
+        return ret;
 
-    *data_size = sizeof(AVFrame);
-    *(AVFrame*)data = s->frame;
+    *got_frame = 1;
 
     /* report that the buffer was completely consumed */
     return buf_size;
@@ -460,14 +463,14 @@ static av_cold int cinepak_decode_end(AVCodecContext *avctx)
 {
     CinepakContext *s = avctx->priv_data;
 
-    if (s->frame.data[0])
-        avctx->release_buffer(avctx, &s->frame);
+    av_frame_free(&s->frame);
 
     return 0;
 }
 
 AVCodec ff_cinepak_decoder = {
     .name           = "cinepak",
+    .long_name      = NULL_IF_CONFIG_SMALL("Cinepak"),
     .type           = AVMEDIA_TYPE_VIDEO,
     .id             = AV_CODEC_ID_CINEPAK,
     .priv_data_size = sizeof(CinepakContext),
@@ -475,5 +478,4 @@ AVCodec ff_cinepak_decoder = {
     .close          = cinepak_decode_end,
     .decode         = cinepak_decode_frame,
     .capabilities   = CODEC_CAP_DR1,
-    .long_name      = NULL_IF_CONFIG_SMALL("Cinepak"),
 };