virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

avformat/ivfenc: move bsf insertion to the init function

Browse Source 
Reviewed-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2020-05-10 10:50:47 -03:00
parent 8e12f09a25
commit 2932905255
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libavformat/ivfenc.c
View File

@ -43,6 +43,16 @@ static int ivf_init(AVFormatContext *s)
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
if (par->codec_id == AV_CODEC_ID_VP9) {
int ret = ff_stream_add_bitstream_filter(s->streams[0], "vp9_superframe", NULL);
if (ret < 0)
return ret;
} else if (par->codec_id == AV_CODEC_ID_AV1) {
int ret = ff_stream_add_bitstream_filter(s->streams[0], "av1_metadata", "td=insert");
if (ret < 0)
return ret;
}
return 0; return 0;
} }
@ -100,19 +110,6 @@ static int ivf_write_trailer(AVFormatContext *s)
return 0; return 0;
} }
static int ivf_check_bitstream(struct AVFormatContext *s, const AVPacket *pkt)
{
int ret = 1;
AVStream *st = s->streams[pkt->stream_index];
if (st->codecpar->codec_id == AV_CODEC_ID_VP9)
ret = ff_stream_add_bitstream_filter(st, "vp9_superframe", NULL);
else if (st->codecpar->codec_id == AV_CODEC_ID_AV1)
ret = ff_stream_add_bitstream_filter(st, "av1_metadata", "td=insert");
return ret;
}
static const AVCodecTag codec_ivf_tags[] = { static const AVCodecTag codec_ivf_tags[] = {
{ AV_CODEC_ID_VP8, MKTAG('V', 'P', '8', '0') }, { AV_CODEC_ID_VP8, MKTAG('V', 'P', '8', '0') },
{ AV_CODEC_ID_VP9, MKTAG('V', 'P', '9', '0') }, { AV_CODEC_ID_VP9, MKTAG('V', 'P', '9', '0') },
@ -131,6 +128,5 @@ AVOutputFormat ff_ivf_muxer = {
.write_header = ivf_write_header, .write_header = ivf_write_header,
.write_packet = ivf_write_packet, .write_packet = ivf_write_packet,
.write_trailer = ivf_write_trailer, .write_trailer = ivf_write_trailer,
.check_bitstream = ivf_check_bitstream,
.codec_tag = (const AVCodecTag* const []){ codec_ivf_tags, 0 }, .codec_tag = (const AVCodecTag* const []){ codec_ivf_tags, 0 },
}; };