X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fyuv4mpeg.c;h=7913e417a7de469f5eb13532a63deca3b7db5e9f;hb=fbabf1e94405ba81eaa5f2a1f840920f47caed0c;hp=1520b3463528c9c56285a61cb456596da1407a1e;hpb=d298185c730eb025eb9bc9da0ba3f08c2222a450;p=ffmpeg

diff --git a/libavformat/yuv4mpeg.c b/libavformat/yuv4mpeg.c
index 1520b346352..7913e417a7d 100644
--- a/libavformat/yuv4mpeg.c
+++ b/libavformat/yuv4mpeg.c
@@ -2,19 +2,21 @@
  * YUV4MPEG format
  * 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,7 +24,10 @@
 #define Y4M_FRAME_MAGIC "FRAME"
 #define Y4M_LINE_MAX 256
 
-#ifdef CONFIG_ENCODERS
+struct frame_attributes {
+    int interlaced_frame;
+    int top_field_first;
+};
 
 static int yuv4_generate_header(AVFormatContext *s, char* buf)
 {
@@ -30,19 +35,40 @@ static int yuv4_generate_header(AVFormatContext *s, char* buf)
     int width, height;
     int raten, rated, aspectn, aspectd, n;
     char inter;
+    const char *colorspace = "";
 
     st = s->streams[0];
-    width = st->codec.width;
-    height = st->codec.height;
-
-    av_reduce(&raten, &rated, st->codec.frame_rate, st->codec.frame_rate_base, (1UL<<31)-1);
-    
-    aspectn = st->codec.sample_aspect_ratio.num;
-    aspectd = st->codec.sample_aspect_ratio.den;
-    
+    width = st->codec->width;
+    height = st->codec->height;
+
+    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;
+
+    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';
+    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_GRAY8:
+        colorspace = " Cmono";
+        break;
+    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 */
@@ -53,63 +79,67 @@ 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;
 }
 
-static int yuv4_write_packet(AVFormatContext *s, int stream_index,
-                             const uint8_t *buf, int size, int64_t pts)
+static int yuv4_write_packet(AVFormatContext *s, AVPacket *pkt)
 {
-    AVStream *st = s->streams[stream_index];
-    ByteIOContext *pb = &s->pb;
+    AVStream *st = s->streams[pkt->stream_index];
+    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];
     uint8_t *ptr, *ptr1, *ptr2;
 
-    picture = (AVPicture *)buf;
+    picture = (AVPicture *)pkt->data;
 
     /* for the first packet we have to output the header as well */
     if (*first_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 -EIO;
-	} else {
-	    put_buffer(pb, buf2, strlen(buf2)); 
-	}
+        if (yuv4_generate_header(s, buf2) < 0) {
+            av_log(s, AV_LOG_ERROR, "Error. YUV4MPEG stream header write failed.\n");
+            return AVERROR(EIO);
+        } else {
+            put_buffer(pb, buf2, strlen(buf2));
+        }
     }
 
     /* construct frame header */
-    
+
     m = snprintf(buf1, sizeof(buf1), "%s\n", Y4M_FRAME_MAGIC);
     put_buffer(pb, buf1, strlen(buf1));
 
-    width = st->codec.width;
-    height = st->codec.height;
-    
+    width = st->codec->width;
+    height = st->codec->height;
+
     ptr = picture->data[0];
     for(i=0;i<height;i++) {
         put_buffer(pb, ptr, width);
         ptr += picture->linesize[0];
     }
 
-    height >>= 1;
-    width >>= 1;
+    if (st->codec->pix_fmt != PIX_FMT_GRAY8){
+    // 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;i<height;i++) {		/* Cb */
+    for(i=0;i<height;i++) {     /* Cb */
         put_buffer(pb, ptr1, width);
         ptr1 += picture->linesize[1];
     }
-    for(i=0;i<height;i++) {	/* Cr */
+    for(i=0;i<height;i++) {     /* Cr */
         put_buffer(pb, ptr2, width);
             ptr2 += picture->linesize[2];
     }
+    }
     put_flush_packet(pb);
     return 0;
 }
@@ -117,78 +147,190 @@ static int yuv4_write_packet(AVFormatContext *s, int stream_index,
 static int yuv4_write_header(AVFormatContext *s)
 {
     int* first_pkt = s->priv_data;
-    
+
     if (s->nb_streams != 1)
-        return -EIO;
-    
-    if (s->streams[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");
-    } 
-    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");
-	return -EIO;
+        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");
+    }
+    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. Use -pix_fmt to select one.\n");
+        return AVERROR(EIO);
     }
-    
-    *first_pkt = 1;
-    return 0;
-}
 
-static int yuv4_write_trailer(AVFormatContext *s)
-{
+    *first_pkt = 1;
     return 0;
 }
 
-AVOutputFormat yuv4mpegpipe_oformat = {
+#ifdef CONFIG_YUV4MPEGPIPE_MUXER
+AVOutputFormat yuv4mpegpipe_muxer = {
     "yuv4mpegpipe",
     "YUV4MPEG pipe format",
     "",
-    "yuv4mpeg",
+    "y4m",
     sizeof(int),
     CODEC_ID_NONE,
     CODEC_ID_RAWVIDEO,
     yuv4_write_header,
     yuv4_write_packet,
-    yuv4_write_trailer,
     .flags = AVFMT_RAWPICTURE,
 };
-#endif //CONFIG_ENCODERS
+#endif
 
 /* 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;
+    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;
     AVStream *st;
-    
+    struct frame_attributes *s1 = s->priv_data;
+
     for (i=0; i<MAX_YUV4_HEADER; i++) {
         header[i] = get_byte(pb);
-	if (header[i] == '\n') {
-	    header[i+1] = 0;
-	    break;
-	}
+        if (header[i] == '\n') {
+            header[i+1] = 0x20;  // Add a space after last option. Makes parsing "444" vs "444alpha" easier.
+            header[i+2] = 0;
+            break;
+        }
     }
     if (i == MAX_YUV4_HEADER) return -1;
     if (strncmp(header, Y4M_MAGIC, strlen(Y4M_MAGIC))) return -1;
-    sscanf(header+strlen(Y4M_MAGIC), " W%d H%d F%d:%d I%c A%d:%d",
-           &width, &height, &raten, &rated, &lacing, &aspectn, &aspectd);
-    
+
+    s1->interlaced_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;
+        switch (*tokstart++) {
+        case 'W': // Width. Required.
+            width = strtol(tokstart, &tokend, 10);
+            tokstart=tokend;
+            break;
+        case 'H': // Height. Required.
+            height = strtol(tokstart, &tokend, 10);
+            tokstart=tokend;
+            break;
+        case 'C': // Color space
+            if (strncmp("420jpeg",tokstart,7)==0)
+                pix_fmt = PIX_FMT_YUV420P;
+            else if (strncmp("420mpeg2",tokstart,8)==0)
+                pix_fmt = PIX_FMT_YUV420P;
+            else if (strncmp("420paldv", tokstart, 8)==0)
+                pix_fmt = PIX_FMT_YUV420P;
+            else if (strncmp("411", tokstart, 3)==0)
+                pix_fmt = PIX_FMT_YUV411P;
+            else if (strncmp("422", tokstart, 3)==0)
+                pix_fmt = PIX_FMT_YUV422P;
+            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)
+                pix_fmt = PIX_FMT_YUV444P;
+            else if (strncmp("mono",tokstart, 4)==0) {
+                pix_fmt = PIX_FMT_GRAY8;
+            } else {
+                av_log(s, AV_LOG_ERROR, "YUV4MPEG stream contains an unknown pixel format.\n");
+                return -1;
+            }
+            while(tokstart<header_end&&*tokstart!=0x20) tokstart++;
+            break;
+        case 'I': // Interlace type
+            switch (*tokstart++){
+            case '?':
+                break;
+            case 'p':
+                s1->interlaced_frame=0;
+                break;
+            case 't':
+                s1->interlaced_frame=1;
+                s1->top_field_first=1;
+                break;
+            case 'b':
+                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");
+                return -1;
+            default:
+                av_log(s, AV_LOG_ERROR, "YUV4MPEG has invalid header.\n");
+                return -1;
+            }
+            break;
+        case 'F': // Frame rate
+            sscanf(tokstart,"%d:%d",&raten,&rated); // 0:0 if unknown
+            while(tokstart<header_end&&*tokstart!=0x20) tokstart++;
+            break;
+        case 'A': // Pixel aspect
+            sscanf(tokstart,"%d:%d",&aspectn,&aspectd); // 0:0 if unknown
+            while(tokstart<header_end&&*tokstart!=0x20) tokstart++;
+            break;
+        case 'X': // Vendor extensions
+            if (strncmp("YSCSS=",tokstart,6)==0) {
+                // Older nonstandard pixel format representation
+                tokstart+=6;
+                if (strncmp("420JPEG",tokstart,7)==0)
+                    alt_pix_fmt=PIX_FMT_YUV420P;
+                else if (strncmp("420MPEG2",tokstart,8)==0)
+                    alt_pix_fmt=PIX_FMT_YUV420P;
+                else if (strncmp("420PALDV",tokstart,8)==0)
+                    alt_pix_fmt=PIX_FMT_YUV420P;
+                else if (strncmp("411",tokstart,3)==0)
+                    alt_pix_fmt=PIX_FMT_YUV411P;
+                else if (strncmp("422",tokstart,3)==0)
+                    alt_pix_fmt=PIX_FMT_YUV422P;
+                else if (strncmp("444",tokstart,3)==0)
+                    alt_pix_fmt=PIX_FMT_YUV444P;
+            }
+            while(tokstart<header_end&&*tokstart!=0x20) tokstart++;
+            break;
+        }
+    }
+
+    if ((width == -1) || (height == -1)) {
+        av_log(s, AV_LOG_ERROR, "YUV4MPEG has invalid header.\n");
+        return -1;
+    }
+
+    if (pix_fmt == PIX_FMT_NONE) {
+        if (alt_pix_fmt == PIX_FMT_NONE)
+            pix_fmt = PIX_FMT_YUV420P;
+        else
+            pix_fmt = alt_pix_fmt;
+    }
+
+    if (raten == 0 && rated == 0) {
+        // Frame rate unknown
+        raten = 25;
+        rated = 1;
+    }
+
+    if (aspectn == 0 && aspectd == 0) {
+        // Pixel aspect unknown
+        aspectd = 1;
+    }
+
     st = av_new_stream(s, 0);
     st = s->streams[0];
-    st->codec.width = width;
-    st->codec.height = height;
+    st->codec->width = width;
+    st->codec->height = height;
     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.codec_type = CODEC_TYPE_VIDEO;
-    st->codec.codec_id = CODEC_ID_RAWVIDEO;
-    st->codec.sample_aspect_ratio= (AVRational){aspectn, aspectd};
+    av_set_pts_info(st, 64, rated, raten);
+    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};
 
     return 0;
 }
@@ -197,37 +339,37 @@ static int yuv4_read_packet(AVFormatContext *s, AVPacket *pkt)
 {
     int i;
     char header[MAX_FRAME_HEADER+1];
-    int packet_size, ret, width, height;
+    int packet_size, width, height;
     AVStream *st = s->streams[0];
+    struct frame_attributes *s1 = s->priv_data;
 
     for (i=0; i<MAX_FRAME_HEADER; i++) {
-        header[i] = get_byte(&s->pb);
-	if (header[i] == '\n') {
-	    header[i+1] = 0;
-	    break;
-	}
+        header[i] = get_byte(s->pb);
+        if (header[i] == '\n') {
+            header[i+1] = 0;
+            break;
+        }
     }
     if (i == MAX_FRAME_HEADER) return -1;
     if (strncmp(header, Y4M_FRAME_MAGIC, strlen(Y4M_FRAME_MAGIC))) return -1;
-    
-    width = st->codec.width;
-    height = st->codec.height;
 
-    packet_size = avpicture_get_size(st->codec.pix_fmt, width, height);
+    width = st->codec->width;
+    height = st->codec->height;
+
+    packet_size = avpicture_get_size(st->codec->pix_fmt, width, height);
     if (packet_size < 0)
-        av_abort();
+        return -1;
 
-    if (av_new_packet(pkt, packet_size) < 0)
-        return -EIO;
+    if (av_get_packet(s->pb, pkt, packet_size) != packet_size)
+        return AVERROR(EIO);
 
-    pkt->stream_index = 0;
-    ret = get_buffer(&s->pb, pkt->data, pkt->size);
-    if (ret != pkt->size) {
-        av_free_packet(pkt);
-        return -EIO;
-    } else {
-        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;
     }
+
+    pkt->stream_index = 0;
+    return 0;
 }
 
 static int yuv4_read_close(AVFormatContext *s)
@@ -235,23 +377,24 @@ static int yuv4_read_close(AVFormatContext *s)
     return 0;
 }
 
-AVInputFormat yuv4mpegpipe_iformat = {
+static int yuv4_probe(AVProbeData *pd)
+{
+    /* check file header */
+    if (strncmp(pd->buf, Y4M_MAGIC, sizeof(Y4M_MAGIC)-1)==0)
+        return AVPROBE_SCORE_MAX;
+    else
+        return 0;
+}
+
+#ifdef CONFIG_YUV4MPEGPIPE_DEMUXER
+AVInputFormat yuv4mpegpipe_demuxer = {
     "yuv4mpegpipe",
     "YUV4MPEG pipe format",
-    0,
-    NULL,
+    sizeof(struct frame_attributes),
+    yuv4_probe,
     yuv4_read_header,
     yuv4_read_packet,
     yuv4_read_close,
-    .extensions = "yuv4mpeg"
+    .extensions = "y4m"
 };
-
-int yuv4mpeg_init(void)
-{
-    av_register_input_format(&yuv4mpegpipe_iformat);
-#ifdef CONFIG_ENCODERS
-    av_register_output_format(&yuv4mpegpipe_oformat);
-#endif //CONFIG_ENCODERS
-    return 0;
-}
-
+#endif