mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
e37f161e66
* qatar/master: (71 commits) movenc: Allow writing to a non-seekable output if using empty moov movenc: Support adding isml (smooth streaming live) metadata libavcodec: Don't crash in avcodec_encode_audio if time_base isn't set sunrast: Document the different Sun Raster file format types. sunrast: Add a check for experimental type. libspeexenc: use AVSampleFormat instead of deprecated/removed SampleFormat lavf: remove disabled FF_API_SET_PTS_INFO cruft lavf: remove disabled FF_API_OLD_INTERRUPT_CB cruft lavf: remove disabled FF_API_REORDER_PRIVATE cruft lavf: remove disabled FF_API_SEEK_PUBLIC cruft lavf: remove disabled FF_API_STREAM_COPY cruft lavf: remove disabled FF_API_PRELOAD cruft lavf: remove disabled FF_API_NEW_STREAM cruft lavf: remove disabled FF_API_RTSP_URL_OPTIONS cruft lavf: remove disabled FF_API_MUXRATE cruft lavf: remove disabled FF_API_FILESIZE cruft lavf: remove disabled FF_API_TIMESTAMP cruft lavf: remove disabled FF_API_LOOP_OUTPUT cruft lavf: remove disabled FF_API_LOOP_INPUT cruft lavf: remove disabled FF_API_AVSTREAM_QUALITY cruft ... Conflicts: doc/APIchanges libavcodec/8bps.c libavcodec/avcodec.h libavcodec/libx264.c libavcodec/mjpegbdec.c libavcodec/options.c libavcodec/sunrast.c libavcodec/utils.c libavcodec/version.h libavcodec/x86/h264_deblock.asm libavdevice/libdc1394.c libavdevice/v4l2.c libavformat/avformat.h libavformat/avio.c libavformat/avio.h libavformat/aviobuf.c libavformat/dv.c libavformat/mov.c libavformat/utils.c libavformat/version.h libavformat/wtv.c libavutil/Makefile libavutil/file.c libswscale/x86/input.asm libswscale/x86/swscale_mmx.c libswscale/x86/swscale_template.c tests/ref/lavf/ffm Merged-by: Michael Niedermayer <michaelni@gmx.at>
92 lines
2.6 KiB
C
92 lines
2.6 KiB
C
/*
|
|
* Copyright (c) 2010 David Conrad
|
|
*
|
|
* 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 "internal.h"
|
|
#include "riff.h"
|
|
#include "libavutil/intreadwrite.h"
|
|
|
|
static int probe(AVProbeData *p)
|
|
{
|
|
if (AV_RL32(p->buf) == MKTAG('D','K','I','F')
|
|
&& !AV_RL16(p->buf+4) && AV_RL16(p->buf+6) == 32)
|
|
return AVPROBE_SCORE_MAX-2;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int read_header(AVFormatContext *s)
|
|
{
|
|
AVStream *st;
|
|
AVRational time_base;
|
|
|
|
avio_rl32(s->pb); // DKIF
|
|
avio_rl16(s->pb); // version
|
|
avio_rl16(s->pb); // header size
|
|
|
|
st = avformat_new_stream(s, NULL);
|
|
if (!st)
|
|
return AVERROR(ENOMEM);
|
|
|
|
|
|
st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
|
|
st->codec->codec_tag = avio_rl32(s->pb);
|
|
st->codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags, st->codec->codec_tag);
|
|
st->codec->width = avio_rl16(s->pb);
|
|
st->codec->height = avio_rl16(s->pb);
|
|
time_base.den = avio_rl32(s->pb);
|
|
time_base.num = avio_rl32(s->pb);
|
|
st->duration = avio_rl64(s->pb);
|
|
|
|
st->need_parsing = AVSTREAM_PARSE_HEADERS;
|
|
|
|
if (!time_base.den || !time_base.num) {
|
|
av_log(s, AV_LOG_ERROR, "Invalid frame rate\n");
|
|
return AVERROR_INVALIDDATA;
|
|
}
|
|
|
|
avpriv_set_pts_info(st, 64, time_base.num, time_base.den);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int read_packet(AVFormatContext *s, AVPacket *pkt)
|
|
{
|
|
int ret, size = avio_rl32(s->pb);
|
|
int64_t pts = avio_rl64(s->pb);
|
|
|
|
ret = av_get_packet(s->pb, pkt, size);
|
|
pkt->stream_index = 0;
|
|
pkt->pts = pts;
|
|
pkt->pos -= 12;
|
|
|
|
return ret;
|
|
}
|
|
|
|
AVInputFormat ff_ivf_demuxer = {
|
|
.name = "ivf",
|
|
.long_name = NULL_IF_CONFIG_SMALL("On2 IVF"),
|
|
.read_probe = probe,
|
|
.read_header = read_header,
|
|
.read_packet = read_packet,
|
|
.flags= AVFMT_GENERIC_INDEX,
|
|
.codec_tag = (const AVCodecTag*[]){ff_codec_bmp_tags, 0},
|
|
};
|