yuv4mpeg: support 9/10/16 bit pixel formats
Signed-off-by: Jean First <jeanfirst@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Jean First
Michael Niedermayer
parent
e7117f1c10
commit
f7f6aaf988
@ -20,6 +20,7 @@
|
||||
*/
|
||||
#include "avformat.h"
|
||||
#include "internal.h"
|
||||
#include "libavutil/pixdesc.h"
|
||||
|
||||
#define Y4M_MAGIC "YUV4MPEG2"
|
||||
#define Y4M_FRAME_MAGIC "FRAME"
|
||||
@ -60,6 +61,9 @@ static int yuv4_generate_header(AVFormatContext *s, char* buf)
|
||||
case PIX_FMT_GRAY8:
|
||||
colorspace = " Cmono";
|
||||
break;
|
||||
case PIX_FMT_GRAY16:
|
||||
colorspace = " Cmono16";
|
||||
break;
|
||||
case PIX_FMT_YUV411P:
|
||||
colorspace = " C411 XYSCSS=411";
|
||||
break;
|
||||
@ -76,6 +80,33 @@ static int yuv4_generate_header(AVFormatContext *s, char* buf)
|
||||
case PIX_FMT_YUV444P:
|
||||
colorspace = " C444 XYSCSS=444";
|
||||
break;
|
||||
case PIX_FMT_YUV420P9:
|
||||
colorspace = " C420p9 XYSCSS=420P9";
|
||||
break;
|
||||
case PIX_FMT_YUV422P9:
|
||||
colorspace = " C422p9 XYSCSS=422P9";
|
||||
break;
|
||||
case PIX_FMT_YUV444P9:
|
||||
colorspace = " C444p9 XYSCSS=444P9";
|
||||
break;
|
||||
case PIX_FMT_YUV420P10:
|
||||
colorspace = " C420p10 XYSCSS=420P10";
|
||||
break;
|
||||
case PIX_FMT_YUV422P10:
|
||||
colorspace = " C422p10 XYSCSS=422P10";
|
||||
break;
|
||||
case PIX_FMT_YUV444P10:
|
||||
colorspace = " C444p10 XYSCSS=444P10";
|
||||
break;
|
||||
case PIX_FMT_YUV420P16:
|
||||
colorspace = " C420p16 XYSCSS=420P16";
|
||||
break;
|
||||
case PIX_FMT_YUV422P16:
|
||||
colorspace = " C422p16 XYSCSS=422P16";
|
||||
break;
|
||||
case PIX_FMT_YUV444P16:
|
||||
colorspace = " C444p16 XYSCSS=444P16";
|
||||
break;
|
||||
}
|
||||
|
||||
/* construct stream header, if this is the first frame */
|
||||
@ -121,12 +152,39 @@ static int yuv4_write_packet(AVFormatContext *s, AVPacket *pkt)
|
||||
height = st->codec->height;
|
||||
|
||||
ptr = picture->data[0];
|
||||
|
||||
switch (st->codec->pix_fmt) {
|
||||
case PIX_FMT_GRAY8:
|
||||
case PIX_FMT_YUV411P:
|
||||
case PIX_FMT_YUV420P:
|
||||
case PIX_FMT_YUV422P:
|
||||
case PIX_FMT_YUV444P:
|
||||
break;
|
||||
case PIX_FMT_GRAY16:
|
||||
case PIX_FMT_YUV420P9:
|
||||
case PIX_FMT_YUV422P9:
|
||||
case PIX_FMT_YUV444P9:
|
||||
case PIX_FMT_YUV420P10:
|
||||
case PIX_FMT_YUV422P10:
|
||||
case PIX_FMT_YUV444P10:
|
||||
case PIX_FMT_YUV420P16:
|
||||
case PIX_FMT_YUV422P16:
|
||||
case PIX_FMT_YUV444P16:
|
||||
width *= 2;
|
||||
break;
|
||||
default:
|
||||
av_log(s, AV_LOG_ERROR, "The pixel format '%s' is not supported.\n",
|
||||
av_get_pix_fmt_name(st->codec->pix_fmt));
|
||||
return AVERROR(EINVAL);
|
||||
}
|
||||
|
||||
for (i = 0; i < height; i++) {
|
||||
avio_write(pb, ptr, width);
|
||||
ptr += picture->linesize[0];
|
||||
}
|
||||
|
||||
if (st->codec->pix_fmt != PIX_FMT_GRAY8) {
|
||||
if (st->codec->pix_fmt != PIX_FMT_GRAY8 &&
|
||||
st->codec->pix_fmt != PIX_FMT_GRAY16) {
|
||||
// Adjust for smaller Cb and Cr planes
|
||||
avcodec_get_chroma_sub_sample(st->codec->pix_fmt, &h_chroma_shift,
|
||||
&v_chroma_shift);
|
||||
@ -144,6 +202,7 @@ static int yuv4_write_packet(AVFormatContext *s, AVPacket *pkt)
|
||||
ptr2 += picture->linesize[2];
|
||||
}
|
||||
}
|
||||
|
||||
avio_flush(pb);
|
||||
return 0;
|
||||
}
|
||||
@ -161,15 +220,42 @@ static int yuv4_write_header(AVFormatContext *s)
|
||||
return AVERROR(EINVAL);
|
||||
}
|
||||
|
||||
if (s->streams[0]->codec->pix_fmt == PIX_FMT_YUV411P) {
|
||||
av_log(s, AV_LOG_ERROR, "Warning: generating rarely used 4:1:1 YUV "
|
||||
switch (s->streams[0]->codec->pix_fmt) {
|
||||
case PIX_FMT_YUV411P:
|
||||
av_log(s, AV_LOG_WARNING, "Warning: generating rarely used 4:1:1 YUV "
|
||||
"stream, some mjpegtools might not work.\n");
|
||||
} else if ((s->streams[0]->codec->pix_fmt != PIX_FMT_YUV420P) &&
|
||||
(s->streams[0]->codec->pix_fmt != PIX_FMT_YUV422P) &&
|
||||
(s->streams[0]->codec->pix_fmt != PIX_FMT_GRAY8) &&
|
||||
(s->streams[0]->codec->pix_fmt != PIX_FMT_YUV444P)) {
|
||||
av_log(s, AV_LOG_ERROR, "ERROR: yuv4mpeg only handles yuv444p, "
|
||||
"yuv422p, yuv420p, yuv411p and gray pixel formats. "
|
||||
break;
|
||||
case PIX_FMT_GRAY8:
|
||||
case PIX_FMT_GRAY16:
|
||||
case PIX_FMT_YUV420P:
|
||||
case PIX_FMT_YUV422P:
|
||||
case PIX_FMT_YUV444P:
|
||||
break;
|
||||
case PIX_FMT_YUV420P9:
|
||||
case PIX_FMT_YUV422P9:
|
||||
case PIX_FMT_YUV444P9:
|
||||
case PIX_FMT_YUV420P10:
|
||||
case PIX_FMT_YUV422P10:
|
||||
case PIX_FMT_YUV444P10:
|
||||
case PIX_FMT_YUV420P16:
|
||||
case PIX_FMT_YUV422P16:
|
||||
case PIX_FMT_YUV444P16:
|
||||
if (s->streams[0]->codec->strict_std_compliance >= FF_COMPLIANCE_NORMAL) {
|
||||
av_log(s, AV_LOG_ERROR, "'%s' is not a official yuv4mpegpipe pixel format. "
|
||||
"Use '-strict -1' to encode to this pixel format.\n",
|
||||
av_get_pix_fmt_name(s->streams[0]->codec->pix_fmt));
|
||||
return AVERROR(EINVAL);
|
||||
}
|
||||
av_log(s, AV_LOG_WARNING, "Warning: generating non standart YUV stream. "
|
||||
"Mjpegtools will not work.\n");
|
||||
break;
|
||||
default:
|
||||
av_log(s, AV_LOG_ERROR, "ERROR: yuv4mpeg can only handle "
|
||||
"yuv444p, yuv422p, yuv420p, yuv411p and gray8 pixel formats. "
|
||||
"And using 'strict -1' also yuv444p9, yuv422p9, yuv420p9, "
|
||||
"yuv444p10, yuv422p10, yuv420p10, "
|
||||
"yuv444p16, yuv422p16, yuv420p16 "
|
||||
"and gray16 pixel formats. "
|
||||
"Use -pix_fmt to select one.\n");
|
||||
return AVERROR(EIO);
|
||||
}
|
||||
@ -249,21 +335,41 @@ static int yuv4_read_header(AVFormatContext *s)
|
||||
} else if (strncmp("420paldv", tokstart, 8) == 0) {
|
||||
pix_fmt = PIX_FMT_YUV420P;
|
||||
chroma_sample_location = AVCHROMA_LOC_TOPLEFT;
|
||||
} else if (strncmp("420p16", tokstart, 6) == 0) {
|
||||
pix_fmt = PIX_FMT_YUV420P16;
|
||||
} else if (strncmp("422p16", tokstart, 6) == 0) {
|
||||
pix_fmt = PIX_FMT_YUV422P16;
|
||||
} else if (strncmp("444p16", tokstart, 6) == 0) {
|
||||
pix_fmt = PIX_FMT_YUV444P16;
|
||||
} else if (strncmp("420p10", tokstart, 6) == 0) {
|
||||
pix_fmt = PIX_FMT_YUV420P10;
|
||||
} else if (strncmp("422p10", tokstart, 6) == 0) {
|
||||
pix_fmt = PIX_FMT_YUV422P10;
|
||||
} else if (strncmp("444p10", tokstart, 6) == 0) {
|
||||
pix_fmt = PIX_FMT_YUV444P10;
|
||||
} else if (strncmp("420p9", tokstart, 5) == 0) {
|
||||
pix_fmt = PIX_FMT_YUV420P9;
|
||||
} else if (strncmp("422p9", tokstart, 5) == 0) {
|
||||
pix_fmt = PIX_FMT_YUV422P9;
|
||||
} else if (strncmp("444p9", tokstart, 5) == 0) {
|
||||
pix_fmt = PIX_FMT_YUV444P9;
|
||||
} else if (strncmp("420", tokstart, 3) == 0) {
|
||||
pix_fmt = PIX_FMT_YUV420P;
|
||||
chroma_sample_location = AVCHROMA_LOC_CENTER;
|
||||
} else if (strncmp("411", tokstart, 3) == 0)
|
||||
} else if (strncmp("411", tokstart, 3) == 0) {
|
||||
pix_fmt = PIX_FMT_YUV411P;
|
||||
else if (strncmp("422", tokstart, 3) == 0)
|
||||
} else if (strncmp("422", tokstart, 3) == 0) {
|
||||
pix_fmt = PIX_FMT_YUV422P;
|
||||
else if (strncmp("444alpha", tokstart, 8) == 0 ) {
|
||||
} else if (strncmp("444alpha", tokstart, 8) == 0 ) {
|
||||
av_log(s, AV_LOG_ERROR, "Cannot handle 4:4:4:4 "
|
||||
"YUV4MPEG stream.\n");
|
||||
return -1;
|
||||
} else if (strncmp("444", tokstart, 3) == 0)
|
||||
} else if (strncmp("444", tokstart, 3) == 0) {
|
||||
pix_fmt = PIX_FMT_YUV444P;
|
||||
else if (strncmp("mono", tokstart, 4) == 0) {
|
||||
} else if (strncmp("mono", tokstart, 4) == 0) {
|
||||
pix_fmt = PIX_FMT_GRAY8;
|
||||
} else if (strncmp("mono16", tokstart, 6) == 0) {
|
||||
pix_fmt = PIX_FMT_GRAY16;
|
||||
} else {
|
||||
av_log(s, AV_LOG_ERROR, "YUV4MPEG stream contains an unknown "
|
||||
"pixel format.\n");
|
||||
@ -316,6 +422,24 @@ static int yuv4_read_header(AVFormatContext *s)
|
||||
alt_pix_fmt = PIX_FMT_YUV420P;
|
||||
else if (strncmp("420PALDV", tokstart, 8) == 0)
|
||||
alt_pix_fmt = PIX_FMT_YUV420P;
|
||||
else if (strncmp("420P9", tokstart, 5) == 0)
|
||||
alt_pix_fmt = PIX_FMT_YUV420P9;
|
||||
else if (strncmp("422P9", tokstart, 5) == 0)
|
||||
alt_pix_fmt = PIX_FMT_YUV422P9;
|
||||
else if (strncmp("444P9", tokstart, 5) == 0)
|
||||
alt_pix_fmt = PIX_FMT_YUV444P9;
|
||||
else if (strncmp("420P10", tokstart, 6) == 0)
|
||||
alt_pix_fmt = PIX_FMT_YUV420P10;
|
||||
else if (strncmp("422P10", tokstart, 6) == 0)
|
||||
alt_pix_fmt = PIX_FMT_YUV422P10;
|
||||
else if (strncmp("444P10", tokstart, 6) == 0)
|
||||
alt_pix_fmt = PIX_FMT_YUV444P10;
|
||||
else if (strncmp("420P16", tokstart, 6) == 0)
|
||||
alt_pix_fmt = PIX_FMT_YUV420P16;
|
||||
else if (strncmp("422P16", tokstart, 6) == 0)
|
||||
alt_pix_fmt = PIX_FMT_YUV422P16;
|
||||
else if (strncmp("444P16", tokstart, 6) == 0)
|
||||
alt_pix_fmt = PIX_FMT_YUV444P16;
|
||||
else if (strncmp("411", tokstart, 3) == 0)
|
||||
alt_pix_fmt = PIX_FMT_YUV411P;
|
||||
else if (strncmp("422", tokstart, 3) == 0)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user