---
libavformat/yuv4mpeg.c | 35 ++++++++++++++---------------------
1 file changed, 14 insertions(+), 21 deletions(-)
diff --git a/libavformat/yuv4mpeg.c b/libavformat/yuv4mpeg.c
index f793a0e..f588764 100644
--- a/libavformat/yuv4mpeg.c
+++ b/libavformat/yuv4mpeg.c
@@ -19,7 +19,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "libavutil/frame.h"
#include "libavutil/pixdesc.h"
+
#include "avformat.h"
#include "internal.h"
@@ -27,11 +29,6 @@
#define Y4M_FRAME_MAGIC "FRAME"
#define Y4M_LINE_MAX 256
-struct frame_attributes {
- int interlaced_frame;
- int top_field_first;
-};
-
#if CONFIG_YUV4MPEGPIPE_MUXER
static int yuv4_generate_header(AVFormatContext *s, char* buf)
{
@@ -55,8 +52,9 @@ static int yuv4_generate_header(AVFormatContext *s, char* buf)
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->field_state & AV_FRAME_INTERLACED)
+ inter = st->codec->coded_frame->field_state == AV_FRAME_INTERLACED_TFF
? 't' : 'b';
switch (st->codec->pix_fmt) {
case AV_PIX_FMT_GRAY8:
@@ -209,7 +207,7 @@ static int yuv4_read_header(AVFormatContext *s)
enum AVPixelFormat pix_fmt = AV_PIX_FMT_NONE, alt_pix_fmt =
AV_PIX_FMT_NONE;
enum AVChromaLocation chroma_sample_location = AVCHROMA_LOC_UNSPECIFIED;
AVStream *st;
- struct frame_attributes *s1 = s->priv_data;
+ enum AVFieldState *s1 = s->priv_data;
for (i = 0; i < MAX_YUV4_HEADER; i++) {
header[i] = avio_r8(pb);
@@ -225,8 +223,7 @@ static int yuv4_read_header(AVFormatContext *s)
if (strncmp(header, Y4M_MAGIC, strlen(Y4M_MAGIC)))
return -1;
- s1->interlaced_frame = 0;
- s1->top_field_first = 0;
+ *s1 = AV_FRAME_PROGRESSIVE;
header_end = &header[i + 1]; // Include space
for (tokstart = &header[strlen(Y4M_MAGIC) + 1];
tokstart < header_end; tokstart++) {
@@ -279,15 +276,13 @@ static int yuv4_read_header(AVFormatContext *s)
case '?':
break;
case 'p':
- s1->interlaced_frame = 0;
+ *s1 = AV_FRAME_PROGRESSIVE;
break;
case 't':
- s1->interlaced_frame = 1;
- s1->top_field_first = 1;
+ *s1 = AV_FRAME_INTERLACED_TFF;
break;
case 'b':
- s1->interlaced_frame = 1;
- s1->top_field_first = 0;
+ *s1 = AV_FRAME_INTERLACED_BFF;
break;
case 'm':
av_log(s, AV_LOG_ERROR, "YUV4MPEG stream contains mixed "
@@ -377,7 +372,7 @@ static int yuv4_read_packet(AVFormatContext *s, AVPacket
*pkt)
char header[MAX_FRAME_HEADER+1];
int packet_size, width, height, ret;
AVStream *st = s->streams[0];
- struct frame_attributes *s1 = s->priv_data;
+ enum AVFieldState *s1 = s->priv_data;
for (i = 0; i < MAX_FRAME_HEADER; i++) {
header[i] = avio_r8(s->pb);
@@ -409,10 +404,8 @@ static int yuv4_read_packet(AVFormatContext *s, AVPacket
*pkt)
else if (ret != packet_size)
return s->pb->eof_reached ? AVERROR_EOF : AVERROR(EIO);
- if (st->codec->coded_frame) {
- st->codec->coded_frame->interlaced_frame = s1->interlaced_frame;
- st->codec->coded_frame->top_field_first = s1->top_field_first;
- }
+ if (st->codec->coded_frame)
+ st->codec->coded_frame->field_state = *s1;
pkt->stream_index = 0;
return 0;
@@ -431,7 +424,7 @@ static int yuv4_probe(AVProbeData *pd)
AVInputFormat ff_yuv4mpegpipe_demuxer = {
.name = "yuv4mpegpipe",
.long_name = NULL_IF_CONFIG_SMALL("YUV4MPEG pipe"),
- .priv_data_size = sizeof(struct frame_attributes),
+ .priv_data_size = sizeof(enum AVFieldState),
.read_probe = yuv4_probe,
.read_header = yuv4_read_header,
.read_packet = yuv4_read_packet,
--
1.7.9.5
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
