generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libutvideo: use K&R style.

Browse Source
This commit is contained in:
Clément Bœsch 2011-11-15 00:06:02 +01:00
parent 30ca700ba1
commit 3495817468
1 changed files with 43 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
libavcodec/libutvideo.cpp
View File

@ -54,8 +54,7 @@ static av_cold int utvideo_decode_init(AVCodecContext *avctx)
int begin_ret; int begin_ret;
unsigned int buf_size; unsigned int buf_size;
if(avctx->extradata_size != 4*4) if (avctx->extradata_size != 4*4) {
{
av_log(avctx, AV_LOG_ERROR, "Extradata size mismatch.\n"); av_log(avctx, AV_LOG_ERROR, "Extradata size mismatch.\n");
return -1; return -1;
} }
@ -67,36 +66,34 @@ static av_cold int utvideo_decode_init(AVCodecContext *avctx)
info.flags = AV_RL32(avctx->extradata + 12); info.flags = AV_RL32(avctx->extradata + 12);
/* Pick format based on FOURCC */ /* Pick format based on FOURCC */
switch(avctx->codec_tag) switch (avctx->codec_tag) {
{ case MKTAG('U', 'L', 'Y', '0'):
case MKTAG('U', 'L', 'Y', '0'): avctx->pix_fmt = PIX_FMT_YUV420P;
avctx->pix_fmt = PIX_FMT_YUV420P; format = UTVF_YV12;
format = UTVF_YV12; break;
break; case MKTAG('U', 'L', 'Y', '2'):
case MKTAG('U', 'L', 'Y', '2'): avctx->pix_fmt = PIX_FMT_YUYV422;
avctx->pix_fmt = PIX_FMT_YUYV422; format = UTVF_YUY2;
format = UTVF_YUY2; break;
break; case MKTAG('U', 'L', 'R', 'G'):
case MKTAG('U', 'L', 'R', 'G'): avctx->pix_fmt = PIX_FMT_BGR24;
avctx->pix_fmt = PIX_FMT_BGR24; format = UTVF_RGB24_WIN;
format = UTVF_RGB24_WIN; break;
break; case MKTAG('U', 'L', 'R', 'A'):
case MKTAG('U', 'L', 'R', 'A'): avctx->pix_fmt = PIX_FMT_RGB32;
avctx->pix_fmt = PIX_FMT_RGB32; format = UTVF_RGB32_WIN;
format = UTVF_RGB32_WIN; break;
break; default:
default: av_log(avctx, AV_LOG_ERROR,
av_log(avctx, AV_LOG_ERROR, "Not a Ut Video FOURCC: %X\n", avctx->codec_tag);
"Not a Ut Video FOURCC: %X\n", avctx->codec_tag); return -1;
return -1;
} }
/* Only allocate the buffer once */ /* Only allocate the buffer once */
buf_size = avpicture_get_size(avctx->pix_fmt, avctx->width, avctx->height); buf_size = avpicture_get_size(avctx->pix_fmt, avctx->width, avctx->height);
utv->output = (uint8_t *)av_malloc(buf_size * sizeof(uint8_t)); utv->output = (uint8_t *)av_malloc(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"); av_log(avctx, AV_LOG_ERROR, "Unable to allocate output buffer.\n");
return -1; return -1;
} }
@ -124,8 +121,7 @@ static av_cold int utvideo_decode_init(AVCodecContext *avctx)
CBGROSSWIDTH_WINDOWS, &info, sizeof(UtVideoExtra)); CBGROSSWIDTH_WINDOWS, &info, sizeof(UtVideoExtra));
/* Check to see if the decoder initlized properly */ /* Check to see if the decoder initlized properly */
if(begin_ret != 0) if (begin_ret != 0) {
{
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
"Could not initialize decoder: %d\n", begin_ret); "Could not initialize decoder: %d\n", begin_ret);
return -1; return -1;
@ -150,26 +146,25 @@ static int utvideo_decode_frame(AVCodecContext *avctx, void *data,
utv->codec->DecodeFrame(utv->output, avpkt->data, true); utv->codec->DecodeFrame(utv->output, avpkt->data, true);
/* Set the output data depending on the colorspace */ /* Set the output data depending on the colorspace */
switch(avctx->pix_fmt) switch (avctx->pix_fmt) {
{ case PIX_FMT_YUV420P:
case PIX_FMT_YUV420P: pic->linesize[0] = w;
pic->linesize[0] = w; pic->linesize[1] = pic->linesize[2] = w / 2;
pic->linesize[1] = pic->linesize[2] = w / 2; pic->data[0] = utv->output;
pic->data[0] = utv->output; pic->data[2] = utv->output + (w * h);
pic->data[2] = utv->output + (w * h); pic->data[1] = pic->data[2] + (w * h / 4);
pic->data[1] = pic->data[2] + (w * h / 4); break;
break; case PIX_FMT_YUYV422:
case PIX_FMT_YUYV422: pic->linesize[0] = w * 2;
pic->linesize[0] = w * 2; pic->data[0] = utv->output;
pic->data[0] = utv->output; break;
break; case PIX_FMT_BGR24:
case PIX_FMT_BGR24: case PIX_FMT_RGB32:
case PIX_FMT_RGB32: /* Make the linesize negative, since Ut Video uses bottom-up BGR */
/* 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->linesize[0] = -1 * w * (avctx->pix_fmt == PIX_FMT_BGR24 ? 3 : 4); pic->data[0] = utv->output + utv->buf_size + pic->linesize[0];
pic->data[0] = utv->output + utv->buf_size + pic->linesize[0]; break;
break; }
}
*data_size = sizeof(AVFrame); *data_size = sizeof(AVFrame);
*(AVFrame *)data = *pic; *(AVFrame *)data = *pic;