virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

avcodec/dpx: refactor pixel format selection

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2013-10-07 11:20:13 +00:00
parent b8866783c6
commit e745dc2d6f
1 changed files with 38 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
libavcodec/dpx.c
View File

@ -162,11 +162,6 @@ static int decode_frame(AVCodecContext *avctx,
switch (bits_per_color) { switch (bits_per_color) {
case 8: case 8:
if (elements == 4) {
avctx->pix_fmt = AV_PIX_FMT_RGBA;
} else {
avctx->pix_fmt = AV_PIX_FMT_RGB24;
}
total_size = avctx->width * avctx->height * elements; total_size = avctx->width * avctx->height * elements;
break; break;
case 10: case 10:
@ -174,7 +169,6 @@ static int decode_frame(AVCodecContext *avctx,
av_log(avctx, AV_LOG_ERROR, "Packing to 32bit required\n"); av_log(avctx, AV_LOG_ERROR, "Packing to 32bit required\n");
return -1; return -1;
} }
avctx->pix_fmt = AV_PIX_FMT_GBRP10;
total_size = (avctx->width * elements + 2) / 3 * 4 * avctx->height; total_size = (avctx->width * elements + 2) / 3 * 4 * avctx->height;
break; break;
case 12: case 12:
@ -182,15 +176,9 @@ static int decode_frame(AVCodecContext *avctx,
av_log(avctx, AV_LOG_ERROR, "Packing to 16bit required\n"); av_log(avctx, AV_LOG_ERROR, "Packing to 16bit required\n");
return -1; return -1;
} }
avctx->pix_fmt = AV_PIX_FMT_GBRP12;
total_size = 2 * avctx->width * avctx->height * elements; total_size = 2 * avctx->width * avctx->height * elements;
break; break;
case 16: case 16:
if (endian) {
avctx->pix_fmt = elements == 4 ? AV_PIX_FMT_RGBA64BE : AV_PIX_FMT_RGB48BE;
} else {
avctx->pix_fmt = elements == 4 ? AV_PIX_FMT_RGBA64LE : AV_PIX_FMT_RGB48LE;
}
total_size = 2 * avctx->width * avctx->height * elements; total_size = 2 * avctx->width * avctx->height * elements;
break; break;
case 1: case 1:
@ -202,6 +190,44 @@ static int decode_frame(AVCodecContext *avctx,
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
switch (1000 * descriptor + 10 * bits_per_color + endian) {
case 50081:
case 50080:
avctx->pix_fmt = AV_PIX_FMT_RGB24;
break;
case 51081:
case 51080:
avctx->pix_fmt = AV_PIX_FMT_RGBA;
break;
case 50100:
case 51100:
case 50101:
case 51101:
avctx->pix_fmt = AV_PIX_FMT_GBRP10;
break;
case 50120:
case 51120:
case 50121:
case 51121:
avctx->pix_fmt = AV_PIX_FMT_GBRP12;
break;
case 50161:
avctx->pix_fmt = AV_PIX_FMT_RGB48BE;
break;
case 50160:
avctx->pix_fmt = AV_PIX_FMT_RGB48LE;
break;
case 51161:
avctx->pix_fmt = AV_PIX_FMT_RGBA64BE;
break;
case 51160:
avctx->pix_fmt = AV_PIX_FMT_RGBA64LE;
break;
default:
av_log(avctx, AV_LOG_ERROR, "Unsupported format\n");
return AVERROR_PATCHWELCOME;
}
if ((ret = ff_get_buffer(avctx, p, 0)) < 0) if ((ret = ff_get_buffer(avctx, p, 0)) < 0)
return ret; return ret;