v210dec: switch to PIX_FMT_422P10

[ffmpeg] / libavcodec / v210dec.c

diff --git a/libavcodec/v210dec.c b/libavcodec/v210dec.c
index da23ec43b9aee0cc046c9ae97dc61d68eebf9130..94c5b5bb26fecacae385bdc9034c750782a0d451 100644 (file)
--- a/libavcodec/v210dec.c
+++ b/libavcodec/v210dec.c
@@ -30,17 +30,16 @@ static av_cold int decode_init(AVCodecContext *avctx)
         av_log(avctx, AV_LOG_ERROR, "v210 needs even width\n");
         return -1;
     }
-    if (avcodec_check_dimensions(avctx, avctx->width, avctx->height) < 0)
-        return -1;
-    avctx->pix_fmt = PIX_FMT_YUV422P16;
+    avctx->pix_fmt             = PIX_FMT_YUV422P10;
     avctx->bits_per_raw_sample = 10;
 
-    avctx->coded_frame = avcodec_alloc_frame();
+    avctx->coded_frame         = avcodec_alloc_frame();
 
     return 0;
 }
 
-static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPacket *avpkt)
+static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
+                        AVPacket *avpkt)
 {
     int h, w;
     AVFrame *pic = avctx->coded_frame;
@@ -61,22 +60,22 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
     if (avctx->get_buffer(avctx, pic) < 0)
         return -1;
 
-    y = pic->data[0];
-    u = pic->data[1];
-    v = pic->data[2];
-    pic->pict_type = FF_I_TYPE;
+    y = (uint16_t*)pic->data[0];
+    u = (uint16_t*)pic->data[1];
+    v = (uint16_t*)pic->data[2];
+    pic->pict_type = AV_PICTURE_TYPE_I;
     pic->key_frame = 1;
 
-#define READ_PIXELS(a, b, c)       \
-    do {                           \
-        val = le2me_32(*src++);      \
-        *a++ =  val <<  6;           \
-        *b++ = (val >>  4) & 0xFFC0; \
-        *c++ = (val >> 14) & 0xFFC0; \
-    } while (0);
+#define READ_PIXELS(a, b, c)         \
+    do {                             \
+        val  = av_le2ne32(*src++);   \
+        *a++ =  val & 0x3FF;         \
+        *b++ = (val >> 10) & 0x3FF;  \
+        *c++ = (val >> 20) & 0x3FF;  \
+    } while (0)
 
     for (h = 0; h < avctx->height; h++) {
-        const uint32_t *src = psrc;
+        const uint32_t *src = (const uint32_t*)psrc;
         uint32_t val;
         for (w = 0; w < avctx->width - 5; w += 6) {
             READ_PIXELS(u, y, v);
@@ -87,22 +86,22 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
         if (w < avctx->width - 1) {
             READ_PIXELS(u, y, v);
 
-            val  = le2me_32(*src++);
-            *y++ =  val <<  6;
+            val  = av_le2ne32(*src++);
+            *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  = le2me_32(*src++);
-            *v++ =  val <<  6;
-            *y++ = (val >>  4) & 0xFFC0;
+            val  = av_le2ne32(*src++);
+            *v++ =  val & 0x3FF;
+            *y++ = (val >> 10) & 0x3FF;
         }
 
         psrc += stride;
-        y += pic->linesize[0]/2 - avctx->width;
-        u += pic->linesize[1]/2 - avctx->width/2;
-        v += pic->linesize[2]/2 - avctx->width/2;
+        y += pic->linesize[0] / 2 - avctx->width;
+        u += pic->linesize[1] / 2 - avctx->width / 2;
+        v += pic->linesize[2] / 2 - avctx->width / 2;
     }
 
     *data_size = sizeof(AVFrame);
@@ -113,14 +112,17 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
 
 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 v210_decoder = {
+AVCodec ff_v210_decoder = {
     "v210",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_V210,
     0,
     decode_init,