From 2d74541476e268a443b65987d212503dd628bd91 Mon Sep 17 00:00:00 2001 From: Roine Gustafsson Date: Tue, 4 Jan 2005 01:55:50 +0000 Subject: - Writes correct unknown aspect - Adds read and write support for yuv422p and yuv444p - New parser will read all well-formed YUV4MPEG2 stream headers patch by (Roine Gustafsson ) Originally committed as revision 3800 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/yuv4mpeg.c | 166 ++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 151 insertions(+), 15 deletions(-) (limited to 'libavformat/yuv4mpeg.c') diff --git a/libavformat/yuv4mpeg.c b/libavformat/yuv4mpeg.c index 6ebe185b64..f5c85653dd 100644 --- a/libavformat/yuv4mpeg.c +++ b/libavformat/yuv4mpeg.c @@ -30,6 +30,7 @@ static int yuv4_generate_header(AVFormatContext *s, char* buf) int width, height; int raten, rated, aspectn, aspectd, n; char inter; + char *colorspace = ""; st = s->streams[0]; width = st->codec.width; @@ -40,11 +41,28 @@ static int yuv4_generate_header(AVFormatContext *s, char* buf) aspectn = st->codec.sample_aspect_ratio.num; aspectd = st->codec.sample_aspect_ratio.den; + if ( aspectn == 0 && aspectd == 1 ) aspectd = 0; // 0:0 means unknown + inter = 'p'; /* progressive is the default */ if (st->codec.coded_frame && st->codec.coded_frame->interlaced_frame) { inter = st->codec.coded_frame->top_field_first ? 't' : 'b'; } + switch(st->codec.pix_fmt) { + case PIX_FMT_YUV411P: + colorspace = " C411 XYSCSS=411"; + break; + case PIX_FMT_YUV420P: + colorspace = (st->codec.codec_id == CODEC_ID_DVVIDEO)?" C420paldv XYSCSS=420PALDV":" C420mpeg2 XYSCSS=420MPEG2"; + break; + case PIX_FMT_YUV422P: + colorspace = " C422 XYSCSS=422"; + break; + case PIX_FMT_YUV444P: + colorspace = " C444 XYSCSS=444"; + break; + } + /* construct stream header, if this is the first frame */ n = snprintf(buf, Y4M_LINE_MAX, "%s W%d H%d F%d:%d I%c A%d:%d%s\n", Y4M_MAGIC, @@ -53,7 +71,7 @@ static int yuv4_generate_header(AVFormatContext *s, char* buf) raten, rated, inter, aspectn, aspectd, - (st->codec.pix_fmt == PIX_FMT_YUV411P) ? " C411 XYSCSS=411" : " C420mpeg2 XYSCSS=420MPEG2"); + colorspace); return n; } @@ -64,7 +82,7 @@ static int yuv4_write_packet(AVFormatContext *s, AVPacket *pkt) ByteIOContext *pb = &s->pb; AVPicture *picture; int* first_pkt = s->priv_data; - int width, height; + int width, height, h_chroma_shift, v_chroma_shift; int i, m; char buf2[Y4M_LINE_MAX+1]; char buf1[20]; @@ -97,8 +115,11 @@ static int yuv4_write_packet(AVFormatContext *s, AVPacket *pkt) ptr += picture->linesize[0]; } - height >>= 1; - width >>= 1; + // Adjust for smaller Cb and Cr planes + avcodec_get_chroma_sub_sample(st->codec.pix_fmt, &h_chroma_shift, &v_chroma_shift); + width >>= h_chroma_shift; + height >>= v_chroma_shift; + ptr1 = picture->data[1]; ptr2 = picture->data[2]; for(i=0;istreams[0]->codec.pix_fmt == PIX_FMT_YUV411P) { - av_log(s, AV_LOG_ERROR, "Warning: generating non-standard 4:1:1 YUV stream, some mjpegtools might not work.\n"); + av_log(s, AV_LOG_ERROR, "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) { - av_log(s, AV_LOG_ERROR, "ERROR: yuv4mpeg only handles 4:2:0, 4:1:1 YUV data. Use -pix_fmt to select one.\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_YUV444P)) { + av_log(s, AV_LOG_ERROR, "ERROR: yuv4mpeg only handles 4:4:4, 4:2:2, 4:2:0 and 4:1:1 planar YUV data. Use -pix_fmt to select one.\n"); return AVERROR_IO; } @@ -154,29 +177,142 @@ AVOutputFormat yuv4mpegpipe_oformat = { /* Header size increased to allow room for optional flags */ #define MAX_YUV4_HEADER 80 -#define MAX_FRAME_HEADER 10 +#define MAX_FRAME_HEADER 80 static int yuv4_read_header(AVFormatContext *s, AVFormatParameters *ap) { - char header[MAX_YUV4_HEADER+1]; + char header[MAX_YUV4_HEADER+10]; // Include headroom for the longest option + char *tokstart,*tokend,*header_end; int i; ByteIOContext *pb = &s->pb; - int width, height, raten, rated, aspectn, aspectd; - char lacing; + int width=-1, height=-1, raten=0, rated=0, aspectn=0, aspectd=0,interlaced_frame=0,top_field_first=0; + enum PixelFormat pix_fmt=PIX_FMT_NB,alt_pix_fmt=PIX_FMT_NB; AVStream *st; for (i=0; istreams[0]; st->codec.width = width; @@ -184,7 +320,7 @@ static int yuv4_read_header(AVFormatContext *s, AVFormatParameters *ap) av_reduce(&raten, &rated, raten, rated, (1UL<<31)-1); st->codec.frame_rate = raten; st->codec.frame_rate_base = rated; - st->codec.pix_fmt = PIX_FMT_YUV420P; + st->codec.pix_fmt = pix_fmt; st->codec.codec_type = CODEC_TYPE_VIDEO; st->codec.codec_id = CODEC_ID_RAWVIDEO; st->codec.sample_aspect_ratio= (AVRational){aspectn, aspectd}; -- cgit v1.2.3