X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Flibutvideo.cpp;h=635720e976969f4d8b55f35ec1dd581b045a9810;hb=4231bbbf4c54c22fbda6832002675b43f24d3802;hp=27f22e8570f9c5e251325a0e327fca6fb30c9325;hpb=259a960f1b74339626f8da890cc261a4043097fe;p=ffmpeg

diff --git a/libavcodec/libutvideo.cpp b/libavcodec/libutvideo.cpp
index 27f22e8570f..635720e9769 100644
--- a/libavcodec/libutvideo.cpp
+++ b/libavcodec/libutvideo.cpp
@@ -37,7 +37,7 @@ extern "C" {
 typedef struct {
     uint32_t version;
     uint32_t original_format;
-    uint32_t stripes;
+    uint32_t frameinfo_size;
     uint32_t flags;
 } UtVideoExtra;
 
@@ -51,10 +51,10 @@ static av_cold int utvideo_decode_init(AVCodecContext *avctx)
 {
     UtVideoContext *utv = (UtVideoContext *)avctx->priv_data;
     UtVideoExtra info;
-    int defined_fourcc = 0;
+    int format;
+    int begin_ret;
 
-    if(avctx->extradata_size != 4*4)
-    {
+    if (avctx->extradata_size != 4*4) {
         av_log(avctx, AV_LOG_ERROR, "Extradata size mismatch.\n");
         return -1;
     }
@@ -62,72 +62,43 @@ static av_cold int utvideo_decode_init(AVCodecContext *avctx)
     /* Read extradata */
     info.version = AV_RL32(avctx->extradata);
     info.original_format = AV_RL32(avctx->extradata + 4);
-    info.stripes = AV_RL32(avctx->extradata + 8);
+    info.frameinfo_size = AV_RL32(avctx->extradata + 8);
     info.flags = AV_RL32(avctx->extradata + 12);
 
-    /* Try to output the original format */
-    switch(UNFCC(info.original_format))
-    {
-        case UTVF_YV12:
-            avctx->pix_fmt = PIX_FMT_YUV420P;
-            break;
-        case UTVF_YUY2:
-        case UTVF_YUYV:
-        case UTVF_YUNV:
-            avctx->pix_fmt = PIX_FMT_YUYV422;
-            break;
-        case UTVF_UYVY:
-        case UTVF_UYNV:
-            avctx->pix_fmt = PIX_FMT_UYVY422;
-            break;
-        case UTVF_RGB24_WIN:
-            avctx->pix_fmt = PIX_FMT_BGR24;
-            break;
-        case UTVF_RGB32_WIN:
-            avctx->pix_fmt = PIX_FMT_RGB32;
-            break;
-        case UTVF_ARGB32_WIN:
-            avctx->pix_fmt = PIX_FMT_ARGB;
-            break;
-        case 0:
-            /* Fall back on FOURCC */
-            switch(UNFCC(avctx->codec_tag))
-            {
-                case UTVF_ULY0:
-                    avctx->pix_fmt = PIX_FMT_YUV420P;
-                    defined_fourcc = UTVF_YV12;
-                    break;
-                case UTVF_ULY2:
-                    avctx->pix_fmt = PIX_FMT_YUYV422;
-                    defined_fourcc = UTVF_YUY2;
-                    break;
-                case UTVF_ULRG:
-                    avctx->pix_fmt = PIX_FMT_BGR24;
-                    defined_fourcc = UTVF_RGB24_WIN;
-                    break;
-                case UTVF_ULRA:
-                    avctx->pix_fmt = PIX_FMT_RGB32;
-                    defined_fourcc = UTVF_RGB32_WIN;
-                    break;
-            }
-            break;
-        default:
-            av_log(avctx, AV_LOG_ERROR,
-                  "Codec ExtraData is Corrupt or Invalid: %X\n", info.original_format);
-            return -1;
+    /* Pick format based on FOURCC */
+    switch (avctx->codec_tag) {
+    case MKTAG('U', 'L', 'Y', '0'):
+        avctx->pix_fmt = PIX_FMT_YUV420P;
+        format = UTVF_YV12;
+        break;
+    case MKTAG('U', 'L', 'Y', '2'):
+        avctx->pix_fmt = PIX_FMT_YUYV422;
+        format = UTVF_YUY2;
+        break;
+    case MKTAG('U', 'L', 'R', 'G'):
+        avctx->pix_fmt = PIX_FMT_BGR24;
+        format = UTVF_RGB24_WIN;
+        break;
+    case MKTAG('U', 'L', 'R', 'A'):
+        avctx->pix_fmt = PIX_FMT_RGB32;
+        format = UTVF_RGB32_WIN;
+        break;
+    default:
+        av_log(avctx, AV_LOG_ERROR,
+              "Not a Ut Video FOURCC: %X\n", avctx->codec_tag);
+        return -1;
     }
 
     /* Only allocate the buffer once */
     utv->buf_size = avpicture_get_size(avctx->pix_fmt, avctx->width, avctx->height);
     utv->output = (uint8_t *)av_malloc(utv->buf_size * sizeof(uint8_t));
 
-    if(utv->output == NULL)
-    {
+    if (utv->output == NULL) {
         av_log(avctx, AV_LOG_ERROR, "Unable to allocate output buffer.\n");
         return -1;
     }
 
-    /* Allocate the output frame  */
+    /* Allocate the output frame */
     avctx->coded_frame = avcodec_alloc_frame();
 
     /* Ut Video only supports 8-bit */
@@ -146,9 +117,15 @@ static av_cold int utvideo_decode_init(AVCodecContext *avctx)
     utv->codec = CCodec::CreateInstance(UNFCC(avctx->codec_tag), "libavcodec");
 
     /* Initialize Decoding */
-    utv->codec->DecodeBegin(defined_fourcc ? defined_fourcc : UNFCC(info.original_format),
-                            avctx->width, avctx->height, CBGROSSWIDTH_WINDOWS, &info,
-                            sizeof(UtVideoExtra));
+    begin_ret = utv->codec->DecodeBegin(format, avctx->width, avctx->height,
+                            CBGROSSWIDTH_WINDOWS, &info, sizeof(UtVideoExtra));
+
+    /* Check to see if the decoder initlized properly */
+    if (begin_ret != 0) {
+        av_log(avctx, AV_LOG_ERROR,
+               "Could not initialize decoder: %d\n", begin_ret);
+        return -1;
+    }
 
     return 0;
 }
@@ -158,7 +135,7 @@ static int utvideo_decode_frame(AVCodecContext *avctx, void *data,
 {
     UtVideoContext *utv = (UtVideoContext *)avctx->priv_data;
     AVFrame *pic = avctx->coded_frame;
-    unsigned int w = avctx->width, h = avctx->height;
+    int w = avctx->width, h = avctx->height;
 
     /* Set flags */
     pic->reference = 0;
@@ -169,27 +146,25 @@ static int utvideo_decode_frame(AVCodecContext *avctx, void *data,
     utv->codec->DecodeFrame(utv->output, avpkt->data, true);
 
     /* Set the output data depending on the colorspace */
-    switch(avctx->pix_fmt)
-    {
-        case PIX_FMT_YUV420P:
-            pic->linesize[0] = w;
-            pic->linesize[1] = pic->linesize[2] = w / 2;
-            pic->data[0] = utv->output;
-            pic->data[2] = utv->output + (w * h);
-            pic->data[1] = pic->data[2] + (w * h / 4);
-            break;
-        case PIX_FMT_YUYV422:
-        case PIX_FMT_UYVY422:
-            pic->linesize[0] = w * 2;
-            pic->data[0] = utv->output;
-            break;
-        case PIX_FMT_BGR24:
-        case PIX_FMT_RGB32:
-            /* Make the linesize negative, since Ut Video uses bottom-up BGR */
-            pic->linesize[0] = -1 * w * (avctx->pix_fmt == PIX_FMT_BGR24 ? 3 : 4);
-            pic->data[0] = utv->output + utv->buf_size + pic->linesize[0];
-            break;
-     }
+    switch (avctx->pix_fmt) {
+    case PIX_FMT_YUV420P:
+        pic->linesize[0] = w;
+        pic->linesize[1] = pic->linesize[2] = w / 2;
+        pic->data[0] = utv->output;
+        pic->data[2] = utv->output + (w * h);
+        pic->data[1] = pic->data[2] + (w * h / 4);
+        break;
+    case PIX_FMT_YUYV422:
+        pic->linesize[0] = w * 2;
+        pic->data[0] = utv->output;
+        break;
+    case PIX_FMT_BGR24:
+    case PIX_FMT_RGB32:
+        /* Make the linesize negative, since Ut Video uses bottom-up BGR */
+        pic->linesize[0] = -1 * w * (avctx->pix_fmt == PIX_FMT_BGR24 ? 3 : 4);
+        pic->data[0] = utv->output + utv->buf_size + pic->linesize[0];
+        break;
+    }
 
     *data_size = sizeof(AVFrame);
     *(AVFrame *)data = *pic;
@@ -213,7 +188,7 @@ static av_cold int utvideo_decode_close(AVCodecContext *avctx)
 }
 
 AVCodec ff_libutvideo_decoder = {
-    "utvideo",
+    "libutvideo",
     AVMEDIA_TYPE_VIDEO,
     CODEC_ID_UTVIDEO,
     sizeof(UtVideoContext),
@@ -221,7 +196,7 @@ AVCodec ff_libutvideo_decoder = {
     NULL,
     utvideo_decode_close,
     utvideo_decode_frame,
-    CODEC_CAP_LOSSLESS,
+    NULL,
     NULL,
     NULL,
     NULL,