* Miro VideoXL codec
* Copyright (c) 2004 Konstantin Shishkov
*
- * 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 xl.c
+ * @file
* Miro VideoXL codec.
*/
+#include "libavutil/intreadwrite.h"
#include "avcodec.h"
typedef struct VideoXLContext{
static int decode_frame(AVCodecContext *avctx,
void *data, int *data_size,
- const uint8_t *buf, int buf_size)
+ AVPacket *avpkt)
{
+ const uint8_t *buf = avpkt->data;
+ int buf_size = avpkt->size;
VideoXLContext * const a = avctx->priv_data;
- AVFrame * const p= (AVFrame*)&a->pic;
+ AVFrame * const p = &a->pic;
uint8_t *Y, *U, *V;
int i, j;
int stride;
uint32_t val;
- int y0, y1, y2, y3, c0, c1;
+ int y0, y1, y2, y3 = 0, c0 = 0, c1 = 0;
if(p->data[0])
avctx->release_buffer(avctx, p);
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return -1;
}
- p->pict_type= FF_I_TYPE;
+ p->pict_type= AV_PICTURE_TYPE_I;
p->key_frame= 1;
Y = a->pic.data[0];
V = a->pic.data[2];
stride = avctx->width - 4;
+
+ if (buf_size < avctx->width * avctx->height) {
+ av_log(avctx, AV_LOG_ERROR, "Packet is too small\n");
+ return AVERROR_INVALIDDATA;
+ }
+
for (i = 0; i < avctx->height; i++) {
/* lines are stored in reversed order */
buf += stride;
return 0;
}
-AVCodec xl_decoder = {
- "xl",
- CODEC_TYPE_VIDEO,
- CODEC_ID_VIXL,
- sizeof(VideoXLContext),
- decode_init,
- NULL,
- NULL,
- decode_frame,
- CODEC_CAP_DR1,
+static av_cold int decode_end(AVCodecContext *avctx){
+ VideoXLContext * const a = avctx->priv_data;
+ AVFrame *pic = &a->pic;
+
+ if (pic->data[0])
+ avctx->release_buffer(avctx, pic);
+
+ return 0;
+}
+
+AVCodec ff_xl_decoder = {
+ .name = "xl",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = CODEC_ID_VIXL,
+ .priv_data_size = sizeof(VideoXLContext),
+ .init = decode_init,
+ .close = decode_end,
+ .decode = decode_frame,
+ .capabilities = CODEC_CAP_DR1,
+ .long_name = NULL_IF_CONFIG_SMALL("Miro VideoXL"),
};