* 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"
#define Y4M_FRAME_MAGIC "FRAME"
#define Y4M_LINE_MAX 256
-#ifdef CONFIG_MUXERS
+struct frame_attributes {
+ int interlaced_frame;
+ int top_field_first;
+};
static int yuv4_generate_header(AVFormatContext *s, char* buf)
{
int width, height;
int raten, rated, aspectn, aspectd, n;
char inter;
- char *colorspace = "";
+ const char *colorspace = "";
st = s->streams[0];
width = st->codec->width;
return 0;
}
-AVOutputFormat yuv4mpegpipe_oformat = {
+#ifdef CONFIG_YUV4MPEGPIPE_MUXER
+AVOutputFormat yuv4mpegpipe_muxer = {
"yuv4mpegpipe",
"YUV4MPEG pipe format",
"",
yuv4_write_trailer,
.flags = AVFMT_RAWPICTURE,
};
-#endif //CONFIG_MUXERS
+#endif
/* Header size increased to allow room for optional flags */
#define MAX_YUV4_HEADER 80
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;
+ 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 (i == MAX_YUV4_HEADER) return -1;
if (strncmp(header, Y4M_MAGIC, strlen(Y4M_MAGIC))) return -1;
+ 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;
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");
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; i<MAX_FRAME_HEADER; i++) {
header[i] = get_byte(&s->pb);
if (av_get_packet(&s->pb, pkt, packet_size) != packet_size)
return AVERROR_IO;
+ 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;
}
return 0;
}
-AVInputFormat yuv4mpegpipe_iformat = {
+#ifdef CONFIG_YUV4MPEGPIPE_DEMUXER
+AVInputFormat yuv4mpegpipe_demuxer = {
"yuv4mpegpipe",
"YUV4MPEG pipe format",
- 0,
+ 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