h264: fix mmxext chroma deblock to use correct TC values.

[ffmpeg] / libavcodec / v210dec.c

diff --git a/libavcodec/v210dec.c b/libavcodec/v210dec.c
index 420bc473c00947e4434c615f1800ce2a3dd64946..d464572f781337b4590ed59cf3bcb2415ae82f5e 100644 (file)
--- a/libavcodec/v210dec.c
+++ b/libavcodec/v210dec.c
@@ -30,10 +30,12 @@ static av_cold int decode_init(AVCodecContext *avctx)
         av_log(avctx, AV_LOG_ERROR, "v210 needs even width\n");
         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();
+    if (!avctx->coded_frame)
+        return AVERROR(ENOMEM);
 
     return 0;
 }
@@ -63,15 +65,15 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
     y = (uint16_t*)pic->data[0];
     u = (uint16_t*)pic->data[1];
     v = (uint16_t*)pic->data[2];
-    pic->pict_type = FF_I_TYPE;
+    pic->pict_type = AV_PICTURE_TYPE_I;
     pic->key_frame = 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++) {
@@ -87,15 +89,15 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
             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;
@@ -121,14 +123,12 @@ static av_cold int decode_close(AVCodecContext *avctx)
 }
 
 AVCodec ff_v210_decoder = {
-    "v210",
-    AVMEDIA_TYPE_VIDEO,
-    CODEC_ID_V210,
-    0,
-    decode_init,
-    NULL,
-    decode_close,
-    decode_frame,
-    CODEC_CAP_DR1,
+    .name           = "v210",
+    .type           = AVMEDIA_TYPE_VIDEO,
+    .id             = 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"),
 };