X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fyuv4mpeg.c;h=37d8d8a0283d8a510744b99a2d2d6f93f65b0d7a;hb=bc8c50512fc8550ae80535390379e00937623e00;hp=9993de43b422d4bbdb818466b2a0f318cf243707;hpb=a97c1e93aa3c1fbb7cde0699b36ea9be466c6a52;p=ffmpeg diff --git a/libavformat/yuv4mpeg.c b/libavformat/yuv4mpeg.c index 9993de43b42..37d8d8a0283 100644 --- a/libavformat/yuv4mpeg.c +++ b/libavformat/yuv4mpeg.c @@ -1,19 +1,21 @@ /* * 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 Libav. + * + * Libav 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, + * Libav 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 + * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "avformat.h" @@ -27,8 +29,7 @@ struct frame_attributes { int top_field_first; }; -#ifdef CONFIG_MUXERS - +#if CONFIG_YUV4MPEGPIPE_MUXER static int yuv4_generate_header(AVFormatContext *s, char* buf) { AVStream *st; @@ -43,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 @@ -61,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"; @@ -87,11 +90,11 @@ 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; + AVIOContext *pb = s->pb; AVPicture *picture; int* first_pkt = s->priv_data; int width, height, h_chroma_shift, v_chroma_shift; - int i, m; + int i; char buf2[Y4M_LINE_MAX+1]; char buf1[20]; uint8_t *ptr, *ptr1, *ptr2; @@ -103,23 +106,23 @@ 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)); + avio_write(pb, buf2, strlen(buf2)); } } /* construct frame header */ - m = snprintf(buf1, sizeof(buf1), "%s\n", Y4M_FRAME_MAGIC); - put_buffer(pb, buf1, strlen(buf1)); + snprintf(buf1, sizeof(buf1), "%s\n", Y4M_FRAME_MAGIC); + avio_write(pb, buf1, strlen(buf1)); width = st->codec->width; height = st->codec->height; ptr = picture->data[0]; for(i=0;ilinesize[0]; } @@ -132,15 +135,15 @@ static int yuv4_write_packet(AVFormatContext *s, AVPacket *pkt) ptr1 = picture->data[1]; ptr2 = picture->data[2]; for(i=0;ilinesize[1]; } for(i=0;ilinesize[2]; } } - put_flush_packet(pb); + avio_flush(pb); return 0; } @@ -149,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"); @@ -159,32 +162,26 @@ 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 = { - "yuv4mpegpipe", - "YUV4MPEG pipe format", - "", - "y4m", - sizeof(int), - CODEC_ID_NONE, - CODEC_ID_RAWVIDEO, - yuv4_write_header, - yuv4_write_packet, - yuv4_write_trailer, +AVOutputFormat ff_yuv4mpegpipe_muxer = { + .name = "yuv4mpegpipe", + .long_name = NULL_IF_CONFIG_SMALL("YUV4MPEG pipe format"), + .mime_type = "", + .extensions = "y4m", + .priv_data_size = sizeof(int), + .audio_codec = CODEC_ID_NONE, + .video_codec = CODEC_ID_RAWVIDEO, + .write_header = yuv4_write_header, + .write_packet = yuv4_write_packet, .flags = AVFMT_RAWPICTURE, }; -#endif //CONFIG_MUXERS +#endif /* Header size increased to allow room for optional flags */ #define MAX_YUV4_HEADER 80 @@ -195,14 +192,15 @@ 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; + AVIOContext *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; istreams[0]; + if(!st) + return AVERROR(ENOMEM); st->codec->width = width; st->codec->height = height; av_reduce(&raten, &rated, raten, rated, (1UL<<31)-1); av_set_pts_info(st, 64, rated, raten); st->codec->pix_fmt = pix_fmt; - st->codec->codec_type = CODEC_TYPE_VIDEO; + st->codec->codec_type = AVMEDIA_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; } @@ -349,7 +352,7 @@ static int yuv4_read_packet(AVFormatContext *s, AVPacket *pkt) struct frame_attributes *s1 = s->priv_data; for (i=0; ipb); + header[i] = avio_r8(s->pb); if (header[i] == '\n') { header[i+1] = 0; break; @@ -365,8 +368,8 @@ 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); if (s->streams[0]->codec->coded_frame) { s->streams[0]->codec->coded_frame->interlaced_frame = s1->interlaced_frame; @@ -377,39 +380,23 @@ static int yuv4_read_packet(AVFormatContext *s, AVPacket *pkt) return 0; } -static int yuv4_read_close(AVFormatContext *s) -{ - 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 = { - "yuv4mpegpipe", - "YUV4MPEG pipe format", - sizeof(struct frame_attributes), - yuv4_probe, - yuv4_read_header, - yuv4_read_packet, - yuv4_read_close, +#if CONFIG_YUV4MPEGPIPE_DEMUXER +AVInputFormat ff_yuv4mpegpipe_demuxer = { + .name = "yuv4mpegpipe", + .long_name = NULL_IF_CONFIG_SMALL("YUV4MPEG pipe format"), + .priv_data_size = sizeof(struct frame_attributes), + .read_probe = yuv4_probe, + .read_header = yuv4_read_header, + .read_packet = yuv4_read_packet, .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