X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fyuv4mpeg.c;h=8e7acebe7165e9f823f2c686c53c216ab31b3120;hb=ff5ab5c8c9b87908639861a6d29d6cf330c4ed56;hp=3aeb55e8c5dae2e5f99d5b66dd54ff82181b3c86;hpb=bb270c0896b39e1ae9277355e3c120ed3feb64a3;p=ffmpeg diff --git a/libavformat/yuv4mpeg.c b/libavformat/yuv4mpeg.c index 3aeb55e8c5d..8e7acebe716 100644 --- a/libavformat/yuv4mpeg.c +++ b/libavformat/yuv4mpeg.c @@ -1,20 +1,22 @@ /* * YUV4MPEG format - * Copyright (c) 2001, 2002, 2003 Fabrice Bellard. + * Copyright (c) 2001, 2002, 2003 Fabrice Bellard * - * This library is free software; you can redistribute it and/or + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * - * This library is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "avformat.h" @@ -22,15 +24,19 @@ #define Y4M_FRAME_MAGIC "FRAME" #define Y4M_LINE_MAX 256 -#ifdef CONFIG_MUXERS +struct frame_attributes { + int interlaced_frame; + int top_field_first; +}; +#if CONFIG_YUV4MPEGPIPE_MUXER static int yuv4_generate_header(AVFormatContext *s, char* buf) { AVStream *st; int width, height; int raten, rated, aspectn, aspectd, n; char inter; - char *colorspace = ""; + const char *colorspace = ""; st = s->streams[0]; width = st->codec->width; @@ -38,8 +44,8 @@ static int yuv4_generate_header(AVFormatContext *s, char* buf) av_reduce(&raten, &rated, st->codec->time_base.den, st->codec->time_base.num, (1UL<<31)-1); - aspectn = st->codec->sample_aspect_ratio.num; - aspectd = st->codec->sample_aspect_ratio.den; + aspectn = st->sample_aspect_ratio.num; + aspectd = st->sample_aspect_ratio.den; if ( aspectn == 0 && aspectd == 1 ) aspectd = 0; // 0:0 means unknown @@ -56,7 +62,9 @@ static int yuv4_generate_header(AVFormatContext *s, char* buf) colorspace = " C411 XYSCSS=411"; break; case PIX_FMT_YUV420P: - colorspace = (st->codec->codec_id == CODEC_ID_DVVIDEO)?" C420paldv XYSCSS=420PALDV":" C420mpeg2 XYSCSS=420MPEG2"; + colorspace = (st->codec->chroma_sample_location == AVCHROMA_LOC_TOPLEFT)?" C420paldv XYSCSS=420PALDV": + (st->codec->chroma_sample_location == AVCHROMA_LOC_LEFT) ?" C420mpeg2 XYSCSS=420MPEG2": + " C420jpeg XYSCSS=420JPEG"; break; case PIX_FMT_YUV422P: colorspace = " C422 XYSCSS=422"; @@ -82,7 +90,7 @@ static int yuv4_generate_header(AVFormatContext *s, char* buf) static int yuv4_write_packet(AVFormatContext *s, AVPacket *pkt) { AVStream *st = s->streams[pkt->stream_index]; - ByteIOContext *pb = &s->pb; + ByteIOContext *pb = s->pb; AVPicture *picture; int* first_pkt = s->priv_data; int width, height, h_chroma_shift, v_chroma_shift; @@ -98,7 +106,7 @@ static int yuv4_write_packet(AVFormatContext *s, AVPacket *pkt) *first_pkt = 0; if (yuv4_generate_header(s, buf2) < 0) { av_log(s, AV_LOG_ERROR, "Error. YUV4MPEG stream header write failed.\n"); - return AVERROR_IO; + return AVERROR(EIO); } else { put_buffer(pb, buf2, strlen(buf2)); } @@ -144,7 +152,7 @@ static int yuv4_write_header(AVFormatContext *s) int* first_pkt = s->priv_data; if (s->nb_streams != 1) - return AVERROR_IO; + return AVERROR(EIO); if (s->streams[0]->codec->pix_fmt == PIX_FMT_YUV411P) { av_log(s, AV_LOG_ERROR, "Warning: generating rarely used 4:1:1 YUV stream, some mjpegtools might not work.\n"); @@ -154,21 +162,16 @@ static int yuv4_write_header(AVFormatContext *s) (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. Use -pix_fmt to select one.\n"); - return AVERROR_IO; + return AVERROR(EIO); } *first_pkt = 1; return 0; } -static int yuv4_write_trailer(AVFormatContext *s) -{ - return 0; -} - -AVOutputFormat yuv4mpegpipe_oformat = { +AVOutputFormat yuv4mpegpipe_muxer = { "yuv4mpegpipe", - "YUV4MPEG pipe format", + NULL_IF_CONFIG_SMALL("YUV4MPEG pipe format"), "", "y4m", sizeof(int), @@ -176,10 +179,9 @@ AVOutputFormat yuv4mpegpipe_oformat = { CODEC_ID_RAWVIDEO, yuv4_write_header, yuv4_write_packet, - yuv4_write_trailer, .flags = AVFMT_RAWPICTURE, }; -#endif //CONFIG_MUXERS +#endif /* Header size increased to allow room for optional flags */ #define MAX_YUV4_HEADER 80 @@ -190,10 +192,12 @@ static int yuv4_read_header(AVFormatContext *s, AVFormatParameters *ap) 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=-1, height=-1, raten=0, rated=0, aspectn=0, aspectd=0,interlaced_frame=0,top_field_first=0; + ByteIOContext *pb = s->pb; + int width=-1, height=-1, raten=0, rated=0, aspectn=0, aspectd=0; enum PixelFormat pix_fmt=PIX_FMT_NONE,alt_pix_fmt=PIX_FMT_NONE; + enum AVChromaLocation chroma_sample_location = AVCHROMA_LOC_UNSPECIFIED; AVStream *st; + struct frame_attributes *s1 = s->priv_data; for (i=0; iinterlaced_frame = 0; + s1->top_field_first = 0; header_end = &header[i+1]; // Include space for(tokstart = &header[strlen(Y4M_MAGIC) + 1]; tokstart < header_end; tokstart++) { if (*tokstart==0x20) continue; @@ -219,13 +225,16 @@ static int yuv4_read_header(AVFormatContext *s, AVFormatParameters *ap) tokstart=tokend; break; case 'C': // Color space - if (strncmp("420jpeg",tokstart,7)==0) + if (strncmp("420jpeg",tokstart,7)==0) { pix_fmt = PIX_FMT_YUV420P; - else if (strncmp("420mpeg2",tokstart,8)==0) + chroma_sample_location = AVCHROMA_LOC_CENTER; + } else if (strncmp("420mpeg2",tokstart,8)==0) { pix_fmt = PIX_FMT_YUV420P; - else if (strncmp("420paldv", tokstart, 8)==0) + chroma_sample_location = AVCHROMA_LOC_LEFT; + } else if (strncmp("420paldv", tokstart, 8)==0) { pix_fmt = PIX_FMT_YUV420P; - else if (strncmp("411", tokstart, 3)==0) + chroma_sample_location = AVCHROMA_LOC_TOPLEFT; + } else if (strncmp("411", tokstart, 3)==0) pix_fmt = PIX_FMT_YUV411P; else if (strncmp("422", tokstart, 3)==0) pix_fmt = PIX_FMT_YUV422P; @@ -247,15 +256,15 @@ static int yuv4_read_header(AVFormatContext *s, AVFormatParameters *ap) case '?': break; case 'p': - interlaced_frame=0; + s1->interlaced_frame=0; break; case 't': - interlaced_frame=1; - top_field_first=1; + s1->interlaced_frame=1; + s1->top_field_first=1; break; case 'b': - interlaced_frame=1; - top_field_first=0; + s1->interlaced_frame=1; + s1->top_field_first=0; break; case 'm': av_log(s, AV_LOG_ERROR, "YUV4MPEG stream contains mixed interlaced and non-interlaced frames.\n"); @@ -319,7 +328,8 @@ static int yuv4_read_header(AVFormatContext *s, AVFormatParameters *ap) } st = av_new_stream(s, 0); - st = s->streams[0]; + if(!st) + return AVERROR(ENOMEM); st->codec->width = width; st->codec->height = height; av_reduce(&raten, &rated, raten, rated, (1UL<<31)-1); @@ -327,7 +337,8 @@ static int yuv4_read_header(AVFormatContext *s, AVFormatParameters *ap) 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}; + st->sample_aspect_ratio= (AVRational){aspectn, aspectd}; + st->codec->chroma_sample_location = chroma_sample_location; return 0; } @@ -338,9 +349,10 @@ static int yuv4_read_packet(AVFormatContext *s, AVPacket *pkt) char header[MAX_FRAME_HEADER+1]; int packet_size, width, height; AVStream *st = s->streams[0]; + struct frame_attributes *s1 = s->priv_data; for (i=0; ipb); + header[i] = get_byte(s->pb); if (header[i] == '\n') { header[i+1] = 0; break; @@ -356,46 +368,35 @@ static int yuv4_read_packet(AVFormatContext *s, AVPacket *pkt) if (packet_size < 0) return -1; - if (av_get_packet(&s->pb, pkt, packet_size) != packet_size) - return AVERROR_IO; + if (av_get_packet(s->pb, pkt, packet_size) != packet_size) + return AVERROR(EIO); - pkt->stream_index = 0; - return 0; -} + if (s->streams[0]->codec->coded_frame) { + s->streams[0]->codec->coded_frame->interlaced_frame = s1->interlaced_frame; + s->streams[0]->codec->coded_frame->top_field_first = s1->top_field_first; + } -static int yuv4_read_close(AVFormatContext *s) -{ + pkt->stream_index = 0; return 0; } static int yuv4_probe(AVProbeData *pd) { /* check file header */ - if (pd->buf_size <= sizeof(Y4M_MAGIC)) - return 0; if (strncmp(pd->buf, Y4M_MAGIC, sizeof(Y4M_MAGIC)-1)==0) return AVPROBE_SCORE_MAX; else return 0; } -AVInputFormat yuv4mpegpipe_iformat = { +#if CONFIG_YUV4MPEGPIPE_DEMUXER +AVInputFormat yuv4mpegpipe_demuxer = { "yuv4mpegpipe", - "YUV4MPEG pipe format", - 0, + NULL_IF_CONFIG_SMALL("YUV4MPEG pipe format"), + sizeof(struct frame_attributes), yuv4_probe, yuv4_read_header, yuv4_read_packet, - yuv4_read_close, .extensions = "y4m" }; - -int yuv4mpeg_init(void) -{ - av_register_input_format(&yuv4mpegpipe_iformat); -#ifdef CONFIG_MUXERS - av_register_output_format(&yuv4mpegpipe_oformat); -#endif //CONFIG_MUXERS - return 0; -} - +#endif