*/
#include "avcodec.h"
+#include "internal.h"
#include "libavutil/bswap.h"
+#include "libavutil/internal.h"
+#include "libavutil/mem.h"
static av_cold int decode_init(AVCodecContext *avctx)
{
if (avctx->width & 1) {
av_log(avctx, AV_LOG_ERROR, "v210 needs even width\n");
- return -1;
+ return AVERROR_INVALIDDATA;
}
- avctx->pix_fmt = PIX_FMT_YUV422P16;
+ avctx->pix_fmt = AV_PIX_FMT_YUV422P10;
avctx->bits_per_raw_sample = 10;
- avctx->coded_frame = avcodec_alloc_frame();
-
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 h, w;
- AVFrame *pic = avctx->coded_frame;
+ int h, w, ret;
+ AVFrame *pic = data;
const uint8_t *psrc = avpkt->data;
uint16_t *y, *u, *v;
int aligned_width = ((avctx->width + 47) / 48) * 48;
int stride = aligned_width * 8 / 3;
- if (pic->data[0])
- avctx->release_buffer(avctx, pic);
-
if (avpkt->size < stride * avctx->height) {
av_log(avctx, AV_LOG_ERROR, "packet too small\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)) < 0)
+ return ret;
y = (uint16_t*)pic->data[0];
u = (uint16_t*)pic->data[1];
#define READ_PIXELS(a, b, c) \
do { \
- val = av_le2ne32(*src++); \
- *a++ = val << 6; \
- *b++ = (val >> 4) & 0xFFC0; \
- *c++ = (val >> 14) & 0xFFC0; \
+ val = av_le2ne32(*src++); \
+ *a++ = val & 0x3FF; \
+ *b++ = (val >> 10) & 0x3FF; \
+ *c++ = (val >> 20) & 0x3FF; \
} while (0)
for (h = 0; h < avctx->height; h++) {
READ_PIXELS(u, y, v);
val = av_le2ne32(*src++);
- *y++ = val << 6;
+ *y++ = val & 0x3FF;
}
if (w < avctx->width - 3) {
- *u++ = (val >> 4) & 0xFFC0;
- *y++ = (val >> 14) & 0xFFC0;
+ *u++ = (val >> 10) & 0x3FF;
+ *y++ = (val >> 20) & 0x3FF;
val = av_le2ne32(*src++);
- *v++ = val << 6;
- *y++ = (val >> 4) & 0xFFC0;
+ *v++ = val & 0x3FF;
+ *y++ = (val >> 10) & 0x3FF;
}
psrc += stride;
v += pic->linesize[2] / 2 - avctx->width / 2;
}
- *data_size = sizeof(AVFrame);
- *(AVFrame*)data = *avctx->coded_frame;
+ *got_frame = 1;
return avpkt->size;
}
-static av_cold int decode_close(AVCodecContext *avctx)
-{
- AVFrame *pic = avctx->coded_frame;
- if (pic->data[0])
- avctx->release_buffer(avctx, pic);
- av_freep(&avctx->coded_frame);
-
- return 0;
-}
-
AVCodec ff_v210_decoder = {
.name = "v210",
.type = AVMEDIA_TYPE_VIDEO,
- .id = CODEC_ID_V210,
+ .id = AV_CODEC_ID_V210,
.init = decode_init,
- .close = decode_close,
.decode = decode_frame,
.capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:2:2 10-bit"),
+ .long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:2:2 10-bit"),
};