#include "avcodec.h"
#include "bytestream.h"
-#include "libavutil/intreadwrite.h"
+#include "internal.h"
static av_cold int decode_init(AVCodecContext *avctx)
{
if (avctx->width & 1) {
- av_log(avctx, AV_LOG_ERROR, "FRWU needs even width\n");
- return -1;
+ av_log(avctx, AV_LOG_ERROR, "frwu needs even width\n");
+ return AVERROR(EINVAL);
}
- avctx->pix_fmt = PIX_FMT_UYVY422;
+ avctx->pix_fmt = AV_PIX_FMT_UYVY422;
avctx->coded_frame = avcodec_alloc_frame();
+ if (!avctx->coded_frame)
+ return AVERROR(ENOMEM);
return 0;
}
-static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
+static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
AVPacket *avpkt)
{
- int field;
+ int field, ret;
AVFrame *pic = avctx->coded_frame;
const uint8_t *buf = avpkt->data;
const uint8_t *buf_end = buf + avpkt->size;
if (avpkt->size < avctx->width * 2 * avctx->height + 4 + 2*8) {
av_log(avctx, AV_LOG_ERROR, "Packet is too small.\n");
- return -1;
+ return AVERROR_INVALIDDATA;
}
- if (bytestream_get_le32(&buf) != AV_RL32("FRW1")) {
+ if (bytestream_get_le32(&buf) != MKTAG('F', 'R', 'W', '1')) {
av_log(avctx, AV_LOG_ERROR, "incorrect marker\n");
- return -1;
+ return AVERROR_INVALIDDATA;
}
pic->reference = 0;
- if (avctx->get_buffer(avctx, pic) < 0)
- return -1;
+ if ((ret = ff_get_buffer(avctx, pic)) < 0) {
+ av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
+ return ret;
+ }
pic->pict_type = AV_PICTURE_TYPE_I;
pic->key_frame = 1;
int field_size, min_field_size = avctx->width * 2 * field_h;
uint8_t *dst = pic->data[0];
if (buf_end - buf < 8)
- return -1;
+ return AVERROR_INVALIDDATA;
buf += 4; // flags? 0x80 == bottom field maybe?
field_size = bytestream_get_le32(&buf);
if (field_size < min_field_size) {
av_log(avctx, AV_LOG_ERROR, "Field size %i is too small (required %i)\n", field_size, min_field_size);
- return -1;
+ return AVERROR_INVALIDDATA;
}
if (buf_end - buf < field_size) {
av_log(avctx, AV_LOG_ERROR, "Packet is too small, need %i, have %i\n", field_size, (int)(buf_end - buf));
- return -1;
+ return AVERROR_INVALIDDATA;
}
if (field)
dst += pic->linesize[0];
buf += field_size - min_field_size;
}
- *data_size = sizeof(AVFrame);
+ *got_frame = 1;
*(AVFrame*)data = *pic;
return avpkt->size;
}
AVCodec ff_frwu_decoder = {
- "FRWU",
- AVMEDIA_TYPE_VIDEO,
- CODEC_ID_FRWU,
- 0,
- decode_init,
- NULL,
- decode_close,
- decode_frame,
- CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Forward Uncompressed"),
+ .name = "frwu",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = AV_CODEC_ID_FRWU,
+ .init = decode_init,
+ .close = decode_close,
+ .decode = decode_frame,
+ .capabilities = CODEC_CAP_DR1,
+ .long_name = NULL_IF_CONFIG_SMALL("Forward Uncompressed"),
};