mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-21 10:55:51 +02:00
2db24cf746
VP80 fourcc are writed for all contexts (without ctx->codec_tag) how to reproduce the issue: 1) Get any vp9 video (for example http://base-n.de/webm/out9.webm) 2) ffmpeg -i out9.webm -vcodec copy out9.ivf 3) out9.ivf have VP80 fourcc at ivf header The proposed fix solves this issue Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
70 lines
2.3 KiB
C
70 lines
2.3 KiB
C
/*
|
|
* Copyright (c) 2010 Reimar Döffinger
|
|
*
|
|
* 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.1 of the License, or (at your option) any later version.
|
|
*
|
|
* 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 FFmpeg; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
#include "avformat.h"
|
|
#include "libavutil/intreadwrite.h"
|
|
|
|
static int ivf_write_header(AVFormatContext *s)
|
|
{
|
|
AVCodecContext *ctx;
|
|
AVIOContext *pb = s->pb;
|
|
|
|
if (s->nb_streams != 1) {
|
|
av_log(s, AV_LOG_ERROR, "Format supports only exactly one video stream\n");
|
|
return AVERROR(EINVAL);
|
|
}
|
|
ctx = s->streams[0]->codec;
|
|
if (ctx->codec_type != AVMEDIA_TYPE_VIDEO ||
|
|
!(ctx->codec_id == AV_CODEC_ID_VP8 || ctx->codec_id == AV_CODEC_ID_VP9)) {
|
|
av_log(s, AV_LOG_ERROR, "Currently only VP8 and VP9 are supported!\n");
|
|
return AVERROR(EINVAL);
|
|
}
|
|
avio_write(pb, "DKIF", 4);
|
|
avio_wl16(pb, 0); // version
|
|
avio_wl16(pb, 32); // header length
|
|
avio_wl32(pb, ctx->codec_tag ? ctx->codec_tag : ctx->codec_id == AV_CODEC_ID_VP9 ? AV_RL32("VP90") : AV_RL32("VP80"));
|
|
avio_wl16(pb, ctx->width);
|
|
avio_wl16(pb, ctx->height);
|
|
avio_wl32(pb, s->streams[0]->time_base.den);
|
|
avio_wl32(pb, s->streams[0]->time_base.num);
|
|
avio_wl64(pb, s->streams[0]->duration); // TODO: duration or number of frames?!?
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int ivf_write_packet(AVFormatContext *s, AVPacket *pkt)
|
|
{
|
|
AVIOContext *pb = s->pb;
|
|
avio_wl32(pb, pkt->size);
|
|
avio_wl64(pb, pkt->pts);
|
|
avio_write(pb, pkt->data, pkt->size);
|
|
|
|
return 0;
|
|
}
|
|
|
|
AVOutputFormat ff_ivf_muxer = {
|
|
.name = "ivf",
|
|
.long_name = NULL_IF_CONFIG_SMALL("On2 IVF"),
|
|
.extensions = "ivf",
|
|
.audio_codec = AV_CODEC_ID_NONE,
|
|
.video_codec = AV_CODEC_ID_VP8,
|
|
.write_header = ivf_write_header,
|
|
.write_packet = ivf_write_packet,
|
|
};
|