2006-05-12 01:07:22 +02:00
|
|
|
/**
|
|
|
|
Copyright (C) 2005 Michael Ahlberg, Måns Rullgård
|
|
|
|
|
|
|
|
Permission is hereby granted, free of charge, to any person
|
|
|
|
obtaining a copy of this software and associated documentation
|
|
|
|
files (the "Software"), to deal in the Software without
|
|
|
|
restriction, including without limitation the rights to use, copy,
|
|
|
|
modify, merge, publish, distribute, sublicense, and/or sell copies
|
|
|
|
of the Software, and to permit persons to whom the Software is
|
|
|
|
furnished to do so, subject to the following conditions:
|
|
|
|
|
|
|
|
The above copyright notice and this permission notice shall be
|
|
|
|
included in all copies or substantial portions of the Software.
|
|
|
|
|
|
|
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
|
|
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
|
|
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
|
|
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
|
|
|
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
|
|
|
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
|
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
|
|
|
DEALINGS IN THE SOFTWARE.
|
|
|
|
**/
|
|
|
|
|
|
|
|
#include <stdlib.h>
|
2016-04-23 16:44:11 +02:00
|
|
|
|
2012-02-06 22:04:46 +01:00
|
|
|
#include "libavutil/avassert.h"
|
2008-05-09 13:56:36 +02:00
|
|
|
#include "libavutil/intreadwrite.h"
|
2016-04-23 16:44:11 +02:00
|
|
|
|
2008-05-09 13:56:36 +02:00
|
|
|
#include "libavcodec/bytestream.h"
|
2016-04-23 16:44:11 +02:00
|
|
|
|
2006-05-12 01:07:22 +02:00
|
|
|
#include "avformat.h"
|
2011-11-29 19:28:15 +01:00
|
|
|
#include "internal.h"
|
2007-11-07 21:22:32 +01:00
|
|
|
#include "oggdec.h"
|
2006-07-12 02:09:34 +02:00
|
|
|
#include "riff.h"
|
2006-05-12 01:07:22 +02:00
|
|
|
|
|
|
|
static int
|
|
|
|
ogm_header(AVFormatContext *s, int idx)
|
|
|
|
{
|
2008-11-06 02:50:56 +01:00
|
|
|
struct ogg *ogg = s->priv_data;
|
|
|
|
struct ogg_stream *os = ogg->streams + idx;
|
2006-05-12 01:07:22 +02:00
|
|
|
AVStream *st = s->streams[idx];
|
2013-09-16 16:17:26 +02:00
|
|
|
GetByteContext p;
|
2006-05-12 01:07:22 +02:00
|
|
|
uint64_t time_unit;
|
|
|
|
uint64_t spu;
|
2012-02-06 22:04:46 +01:00
|
|
|
uint32_t size;
|
2006-05-12 01:07:22 +02:00
|
|
|
|
2013-09-16 16:17:26 +02:00
|
|
|
bytestream2_init(&p, os->buf + os->pstart, os->psize);
|
|
|
|
if (!(bytestream2_peek_byte(&p) & 1))
|
2006-05-12 01:07:22 +02:00
|
|
|
return 0;
|
|
|
|
|
2013-09-16 16:17:26 +02:00
|
|
|
if (bytestream2_peek_byte(&p) == 1) {
|
|
|
|
bytestream2_skip(&p, 1);
|
2006-05-12 01:07:22 +02:00
|
|
|
|
2013-09-16 16:17:26 +02:00
|
|
|
if (bytestream2_peek_byte(&p) == 'v'){
|
2010-03-12 06:16:54 +01:00
|
|
|
int tag;
|
lavf: replace AVStream.codec with AVStream.codecpar
Currently, AVStream contains an embedded AVCodecContext instance, which
is used by demuxers to export stream parameters to the caller and by
muxers to receive stream parameters from the caller. It is also used
internally as the codec context that is passed to parsers.
In addition, it is also widely used by the callers as the decoding (when
demuxer) or encoding (when muxing) context, though this has been
officially discouraged since Libav 11.
There are multiple important problems with this approach:
- the fields in AVCodecContext are in general one of
* stream parameters
* codec options
* codec state
However, it's not clear which ones are which. It is consequently
unclear which fields are a demuxer allowed to set or a muxer allowed to
read. This leads to erratic behaviour depending on whether decoding or
encoding is being performed or not (and whether it uses the AVStream
embedded codec context).
- various synchronization issues arising from the fact that the same
context is used by several different APIs (muxers/demuxers,
parsers, bitstream filters and encoders/decoders) simultaneously, with
there being no clear rules for who can modify what and the different
processes being typically delayed with respect to each other.
- avformat_find_stream_info() making it necessary to support opening
and closing a single codec context multiple times, thus
complicating the semantics of freeing various allocated objects in the
codec context.
Those problems are resolved by replacing the AVStream embedded codec
context with a newly added AVCodecParameters instance, which stores only
the stream parameters exported by the demuxers or read by the muxers.
2014-06-18 20:42:52 +02:00
|
|
|
st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO;
|
2013-09-16 16:17:26 +02:00
|
|
|
bytestream2_skip(&p, 8);
|
|
|
|
tag = bytestream2_get_le32(&p);
|
lavf: replace AVStream.codec with AVStream.codecpar
Currently, AVStream contains an embedded AVCodecContext instance, which
is used by demuxers to export stream parameters to the caller and by
muxers to receive stream parameters from the caller. It is also used
internally as the codec context that is passed to parsers.
In addition, it is also widely used by the callers as the decoding (when
demuxer) or encoding (when muxing) context, though this has been
officially discouraged since Libav 11.
There are multiple important problems with this approach:
- the fields in AVCodecContext are in general one of
* stream parameters
* codec options
* codec state
However, it's not clear which ones are which. It is consequently
unclear which fields are a demuxer allowed to set or a muxer allowed to
read. This leads to erratic behaviour depending on whether decoding or
encoding is being performed or not (and whether it uses the AVStream
embedded codec context).
- various synchronization issues arising from the fact that the same
context is used by several different APIs (muxers/demuxers,
parsers, bitstream filters and encoders/decoders) simultaneously, with
there being no clear rules for who can modify what and the different
processes being typically delayed with respect to each other.
- avformat_find_stream_info() making it necessary to support opening
and closing a single codec context multiple times, thus
complicating the semantics of freeing various allocated objects in the
codec context.
Those problems are resolved by replacing the AVStream embedded codec
context with a newly added AVCodecParameters instance, which stores only
the stream parameters exported by the demuxers or read by the muxers.
2014-06-18 20:42:52 +02:00
|
|
|
st->codecpar->codec_id = ff_codec_get_id(ff_codec_bmp_tags, tag);
|
|
|
|
st->codecpar->codec_tag = tag;
|
2016-04-10 21:58:15 +02:00
|
|
|
if (st->codecpar->codec_id == AV_CODEC_ID_MPEG4)
|
2015-10-30 00:31:13 +01:00
|
|
|
st->need_parsing = AVSTREAM_PARSE_HEADERS;
|
2013-09-16 16:17:26 +02:00
|
|
|
} else if (bytestream2_peek_byte(&p) == 't') {
|
lavf: replace AVStream.codec with AVStream.codecpar
Currently, AVStream contains an embedded AVCodecContext instance, which
is used by demuxers to export stream parameters to the caller and by
muxers to receive stream parameters from the caller. It is also used
internally as the codec context that is passed to parsers.
In addition, it is also widely used by the callers as the decoding (when
demuxer) or encoding (when muxing) context, though this has been
officially discouraged since Libav 11.
There are multiple important problems with this approach:
- the fields in AVCodecContext are in general one of
* stream parameters
* codec options
* codec state
However, it's not clear which ones are which. It is consequently
unclear which fields are a demuxer allowed to set or a muxer allowed to
read. This leads to erratic behaviour depending on whether decoding or
encoding is being performed or not (and whether it uses the AVStream
embedded codec context).
- various synchronization issues arising from the fact that the same
context is used by several different APIs (muxers/demuxers,
parsers, bitstream filters and encoders/decoders) simultaneously, with
there being no clear rules for who can modify what and the different
processes being typically delayed with respect to each other.
- avformat_find_stream_info() making it necessary to support opening
and closing a single codec context multiple times, thus
complicating the semantics of freeing various allocated objects in the
codec context.
Those problems are resolved by replacing the AVStream embedded codec
context with a newly added AVCodecParameters instance, which stores only
the stream parameters exported by the demuxers or read by the muxers.
2014-06-18 20:42:52 +02:00
|
|
|
st->codecpar->codec_type = AVMEDIA_TYPE_SUBTITLE;
|
|
|
|
st->codecpar->codec_id = AV_CODEC_ID_TEXT;
|
2013-09-16 16:17:26 +02:00
|
|
|
bytestream2_skip(&p, 12);
|
2010-03-12 06:16:54 +01:00
|
|
|
} else {
|
2013-09-16 16:17:26 +02:00
|
|
|
uint8_t acid[5] = { 0 };
|
2010-03-12 06:16:54 +01:00
|
|
|
int cid;
|
lavf: replace AVStream.codec with AVStream.codecpar
Currently, AVStream contains an embedded AVCodecContext instance, which
is used by demuxers to export stream parameters to the caller and by
muxers to receive stream parameters from the caller. It is also used
internally as the codec context that is passed to parsers.
In addition, it is also widely used by the callers as the decoding (when
demuxer) or encoding (when muxing) context, though this has been
officially discouraged since Libav 11.
There are multiple important problems with this approach:
- the fields in AVCodecContext are in general one of
* stream parameters
* codec options
* codec state
However, it's not clear which ones are which. It is consequently
unclear which fields are a demuxer allowed to set or a muxer allowed to
read. This leads to erratic behaviour depending on whether decoding or
encoding is being performed or not (and whether it uses the AVStream
embedded codec context).
- various synchronization issues arising from the fact that the same
context is used by several different APIs (muxers/demuxers,
parsers, bitstream filters and encoders/decoders) simultaneously, with
there being no clear rules for who can modify what and the different
processes being typically delayed with respect to each other.
- avformat_find_stream_info() making it necessary to support opening
and closing a single codec context multiple times, thus
complicating the semantics of freeing various allocated objects in the
codec context.
Those problems are resolved by replacing the AVStream embedded codec
context with a newly added AVCodecParameters instance, which stores only
the stream parameters exported by the demuxers or read by the muxers.
2014-06-18 20:42:52 +02:00
|
|
|
st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
|
2013-09-16 16:17:26 +02:00
|
|
|
bytestream2_skip(&p, 8);
|
|
|
|
bytestream2_get_buffer(&p, acid, 4);
|
2010-03-12 06:16:54 +01:00
|
|
|
acid[4] = 0;
|
|
|
|
cid = strtol(acid, NULL, 16);
|
lavf: replace AVStream.codec with AVStream.codecpar
Currently, AVStream contains an embedded AVCodecContext instance, which
is used by demuxers to export stream parameters to the caller and by
muxers to receive stream parameters from the caller. It is also used
internally as the codec context that is passed to parsers.
In addition, it is also widely used by the callers as the decoding (when
demuxer) or encoding (when muxing) context, though this has been
officially discouraged since Libav 11.
There are multiple important problems with this approach:
- the fields in AVCodecContext are in general one of
* stream parameters
* codec options
* codec state
However, it's not clear which ones are which. It is consequently
unclear which fields are a demuxer allowed to set or a muxer allowed to
read. This leads to erratic behaviour depending on whether decoding or
encoding is being performed or not (and whether it uses the AVStream
embedded codec context).
- various synchronization issues arising from the fact that the same
context is used by several different APIs (muxers/demuxers,
parsers, bitstream filters and encoders/decoders) simultaneously, with
there being no clear rules for who can modify what and the different
processes being typically delayed with respect to each other.
- avformat_find_stream_info() making it necessary to support opening
and closing a single codec context multiple times, thus
complicating the semantics of freeing various allocated objects in the
codec context.
Those problems are resolved by replacing the AVStream embedded codec
context with a newly added AVCodecParameters instance, which stores only
the stream parameters exported by the demuxers or read by the muxers.
2014-06-18 20:42:52 +02:00
|
|
|
st->codecpar->codec_id = ff_codec_get_id(ff_codec_wav_tags, cid);
|
2012-02-06 22:04:46 +01:00
|
|
|
// our parser completely breaks AAC in Ogg
|
2016-04-10 21:58:15 +02:00
|
|
|
if (st->codecpar->codec_id != AV_CODEC_ID_AAC)
|
2012-02-06 22:04:46 +01:00
|
|
|
st->need_parsing = AVSTREAM_PARSE_FULL;
|
2010-03-12 06:16:54 +01:00
|
|
|
}
|
2006-05-12 01:07:22 +02:00
|
|
|
|
2013-09-17 15:50:21 +02:00
|
|
|
size = bytestream2_get_le32(&p);
|
2012-02-06 22:04:46 +01:00
|
|
|
size = FFMIN(size, os->psize);
|
2013-09-16 16:17:26 +02:00
|
|
|
time_unit = bytestream2_get_le64(&p);
|
|
|
|
spu = bytestream2_get_le64(&p);
|
2013-11-28 10:54:35 +01:00
|
|
|
if (!time_unit || !spu) {
|
|
|
|
av_log(s, AV_LOG_ERROR, "Invalid timing values.\n");
|
|
|
|
return AVERROR_INVALIDDATA;
|
|
|
|
}
|
|
|
|
|
2013-09-16 16:17:26 +02:00
|
|
|
bytestream2_skip(&p, 4); /* default_len */
|
|
|
|
bytestream2_skip(&p, 8); /* buffersize + bits_per_sample */
|
2006-05-12 01:07:22 +02:00
|
|
|
|
lavf: replace AVStream.codec with AVStream.codecpar
Currently, AVStream contains an embedded AVCodecContext instance, which
is used by demuxers to export stream parameters to the caller and by
muxers to receive stream parameters from the caller. It is also used
internally as the codec context that is passed to parsers.
In addition, it is also widely used by the callers as the decoding (when
demuxer) or encoding (when muxing) context, though this has been
officially discouraged since Libav 11.
There are multiple important problems with this approach:
- the fields in AVCodecContext are in general one of
* stream parameters
* codec options
* codec state
However, it's not clear which ones are which. It is consequently
unclear which fields are a demuxer allowed to set or a muxer allowed to
read. This leads to erratic behaviour depending on whether decoding or
encoding is being performed or not (and whether it uses the AVStream
embedded codec context).
- various synchronization issues arising from the fact that the same
context is used by several different APIs (muxers/demuxers,
parsers, bitstream filters and encoders/decoders) simultaneously, with
there being no clear rules for who can modify what and the different
processes being typically delayed with respect to each other.
- avformat_find_stream_info() making it necessary to support opening
and closing a single codec context multiple times, thus
complicating the semantics of freeing various allocated objects in the
codec context.
Those problems are resolved by replacing the AVStream embedded codec
context with a newly added AVCodecParameters instance, which stores only
the stream parameters exported by the demuxers or read by the muxers.
2014-06-18 20:42:52 +02:00
|
|
|
if(st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO){
|
|
|
|
st->codecpar->width = bytestream2_get_le32(&p);
|
|
|
|
st->codecpar->height = bytestream2_get_le32(&p);
|
2012-03-08 21:11:37 +01:00
|
|
|
avpriv_set_pts_info(st, 64, time_unit, spu * 10000000);
|
2010-03-12 06:16:54 +01:00
|
|
|
} else {
|
lavf: replace AVStream.codec with AVStream.codecpar
Currently, AVStream contains an embedded AVCodecContext instance, which
is used by demuxers to export stream parameters to the caller and by
muxers to receive stream parameters from the caller. It is also used
internally as the codec context that is passed to parsers.
In addition, it is also widely used by the callers as the decoding (when
demuxer) or encoding (when muxing) context, though this has been
officially discouraged since Libav 11.
There are multiple important problems with this approach:
- the fields in AVCodecContext are in general one of
* stream parameters
* codec options
* codec state
However, it's not clear which ones are which. It is consequently
unclear which fields are a demuxer allowed to set or a muxer allowed to
read. This leads to erratic behaviour depending on whether decoding or
encoding is being performed or not (and whether it uses the AVStream
embedded codec context).
- various synchronization issues arising from the fact that the same
context is used by several different APIs (muxers/demuxers,
parsers, bitstream filters and encoders/decoders) simultaneously, with
there being no clear rules for who can modify what and the different
processes being typically delayed with respect to each other.
- avformat_find_stream_info() making it necessary to support opening
and closing a single codec context multiple times, thus
complicating the semantics of freeing various allocated objects in the
codec context.
Those problems are resolved by replacing the AVStream embedded codec
context with a newly added AVCodecParameters instance, which stores only
the stream parameters exported by the demuxers or read by the muxers.
2014-06-18 20:42:52 +02:00
|
|
|
st->codecpar->channels = bytestream2_get_le16(&p);
|
2013-09-16 16:17:26 +02:00
|
|
|
bytestream2_skip(&p, 2); /* block_align */
|
lavf: replace AVStream.codec with AVStream.codecpar
Currently, AVStream contains an embedded AVCodecContext instance, which
is used by demuxers to export stream parameters to the caller and by
muxers to receive stream parameters from the caller. It is also used
internally as the codec context that is passed to parsers.
In addition, it is also widely used by the callers as the decoding (when
demuxer) or encoding (when muxing) context, though this has been
officially discouraged since Libav 11.
There are multiple important problems with this approach:
- the fields in AVCodecContext are in general one of
* stream parameters
* codec options
* codec state
However, it's not clear which ones are which. It is consequently
unclear which fields are a demuxer allowed to set or a muxer allowed to
read. This leads to erratic behaviour depending on whether decoding or
encoding is being performed or not (and whether it uses the AVStream
embedded codec context).
- various synchronization issues arising from the fact that the same
context is used by several different APIs (muxers/demuxers,
parsers, bitstream filters and encoders/decoders) simultaneously, with
there being no clear rules for who can modify what and the different
processes being typically delayed with respect to each other.
- avformat_find_stream_info() making it necessary to support opening
and closing a single codec context multiple times, thus
complicating the semantics of freeing various allocated objects in the
codec context.
Those problems are resolved by replacing the AVStream embedded codec
context with a newly added AVCodecParameters instance, which stores only
the stream parameters exported by the demuxers or read by the muxers.
2014-06-18 20:42:52 +02:00
|
|
|
st->codecpar->bit_rate = bytestream2_get_le32(&p) * 8;
|
|
|
|
st->codecpar->sample_rate = spu * 10000000 / time_unit;
|
|
|
|
avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate);
|
2016-04-10 21:58:15 +02:00
|
|
|
if (size >= 56 && st->codecpar->codec_id == AV_CODEC_ID_AAC) {
|
2013-09-17 15:50:21 +02:00
|
|
|
bytestream2_skip(&p, 4);
|
2012-02-06 22:04:46 +01:00
|
|
|
size -= 4;
|
|
|
|
}
|
|
|
|
if (size > 52) {
|
2015-07-27 22:53:16 +02:00
|
|
|
av_assert0(AV_INPUT_BUFFER_PADDING_SIZE <= 52);
|
2012-02-06 22:04:46 +01:00
|
|
|
size -= 52;
|
2017-04-11 15:06:21 +02:00
|
|
|
if (bytestream2_get_bytes_left(&p) < size)
|
|
|
|
return AVERROR_INVALIDDATA;
|
2017-04-11 15:08:07 +02:00
|
|
|
if (ff_alloc_extradata(st->codecpar, size) < 0)
|
|
|
|
return AVERROR(ENOMEM);
|
2016-04-10 21:58:15 +02:00
|
|
|
bytestream2_get_buffer(&p, st->codecpar->extradata, st->codecpar->extradata_size);
|
2012-02-06 22:04:46 +01:00
|
|
|
}
|
2010-03-12 06:16:54 +01:00
|
|
|
}
|
2013-09-16 16:17:26 +02:00
|
|
|
} else if (bytestream2_peek_byte(&p) == 3) {
|
|
|
|
bytestream2_skip(&p, 7);
|
|
|
|
if (bytestream2_get_bytes_left(&p) > 1)
|
2014-08-12 23:03:55 +02:00
|
|
|
ff_vorbis_stream_comment(s, st, p.buffer, bytestream2_get_bytes_left(&p) - 1);
|
2010-03-12 06:16:51 +01:00
|
|
|
}
|
2006-05-12 01:07:22 +02:00
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
ogm_dshow_header(AVFormatContext *s, int idx)
|
|
|
|
{
|
2008-11-06 02:50:56 +01:00
|
|
|
struct ogg *ogg = s->priv_data;
|
|
|
|
struct ogg_stream *os = ogg->streams + idx;
|
2006-05-12 01:07:22 +02:00
|
|
|
AVStream *st = s->streams[idx];
|
|
|
|
uint8_t *p = os->buf + os->pstart;
|
|
|
|
uint32_t t;
|
|
|
|
|
|
|
|
if(!(*p & 1))
|
|
|
|
return 0;
|
|
|
|
if(*p != 1)
|
|
|
|
return 1;
|
|
|
|
|
2013-12-23 18:09:58 +01:00
|
|
|
if (os->psize < 100)
|
|
|
|
return AVERROR_INVALIDDATA;
|
2007-07-07 22:50:31 +02:00
|
|
|
t = AV_RL32(p + 96);
|
2006-05-12 01:07:22 +02:00
|
|
|
|
|
|
|
if(t == 0x05589f80){
|
2013-12-23 18:09:58 +01:00
|
|
|
if (os->psize < 184)
|
|
|
|
return AVERROR_INVALIDDATA;
|
|
|
|
|
lavf: replace AVStream.codec with AVStream.codecpar
Currently, AVStream contains an embedded AVCodecContext instance, which
is used by demuxers to export stream parameters to the caller and by
muxers to receive stream parameters from the caller. It is also used
internally as the codec context that is passed to parsers.
In addition, it is also widely used by the callers as the decoding (when
demuxer) or encoding (when muxing) context, though this has been
officially discouraged since Libav 11.
There are multiple important problems with this approach:
- the fields in AVCodecContext are in general one of
* stream parameters
* codec options
* codec state
However, it's not clear which ones are which. It is consequently
unclear which fields are a demuxer allowed to set or a muxer allowed to
read. This leads to erratic behaviour depending on whether decoding or
encoding is being performed or not (and whether it uses the AVStream
embedded codec context).
- various synchronization issues arising from the fact that the same
context is used by several different APIs (muxers/demuxers,
parsers, bitstream filters and encoders/decoders) simultaneously, with
there being no clear rules for who can modify what and the different
processes being typically delayed with respect to each other.
- avformat_find_stream_info() making it necessary to support opening
and closing a single codec context multiple times, thus
complicating the semantics of freeing various allocated objects in the
codec context.
Those problems are resolved by replacing the AVStream embedded codec
context with a newly added AVCodecParameters instance, which stores only
the stream parameters exported by the demuxers or read by the muxers.
2014-06-18 20:42:52 +02:00
|
|
|
st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO;
|
|
|
|
st->codecpar->codec_id = ff_codec_get_id(ff_codec_bmp_tags, AV_RL32(p + 68));
|
2011-11-24 20:58:22 +01:00
|
|
|
avpriv_set_pts_info(st, 64, AV_RL64(p + 164), 10000000);
|
lavf: replace AVStream.codec with AVStream.codecpar
Currently, AVStream contains an embedded AVCodecContext instance, which
is used by demuxers to export stream parameters to the caller and by
muxers to receive stream parameters from the caller. It is also used
internally as the codec context that is passed to parsers.
In addition, it is also widely used by the callers as the decoding (when
demuxer) or encoding (when muxing) context, though this has been
officially discouraged since Libav 11.
There are multiple important problems with this approach:
- the fields in AVCodecContext are in general one of
* stream parameters
* codec options
* codec state
However, it's not clear which ones are which. It is consequently
unclear which fields are a demuxer allowed to set or a muxer allowed to
read. This leads to erratic behaviour depending on whether decoding or
encoding is being performed or not (and whether it uses the AVStream
embedded codec context).
- various synchronization issues arising from the fact that the same
context is used by several different APIs (muxers/demuxers,
parsers, bitstream filters and encoders/decoders) simultaneously, with
there being no clear rules for who can modify what and the different
processes being typically delayed with respect to each other.
- avformat_find_stream_info() making it necessary to support opening
and closing a single codec context multiple times, thus
complicating the semantics of freeing various allocated objects in the
codec context.
Those problems are resolved by replacing the AVStream embedded codec
context with a newly added AVCodecParameters instance, which stores only
the stream parameters exported by the demuxers or read by the muxers.
2014-06-18 20:42:52 +02:00
|
|
|
st->codecpar->width = AV_RL32(p + 176);
|
|
|
|
st->codecpar->height = AV_RL32(p + 180);
|
2006-05-12 01:07:22 +02:00
|
|
|
} else if(t == 0x05589f81){
|
2013-12-23 18:09:58 +01:00
|
|
|
if (os->psize < 136)
|
|
|
|
return AVERROR_INVALIDDATA;
|
|
|
|
|
lavf: replace AVStream.codec with AVStream.codecpar
Currently, AVStream contains an embedded AVCodecContext instance, which
is used by demuxers to export stream parameters to the caller and by
muxers to receive stream parameters from the caller. It is also used
internally as the codec context that is passed to parsers.
In addition, it is also widely used by the callers as the decoding (when
demuxer) or encoding (when muxing) context, though this has been
officially discouraged since Libav 11.
There are multiple important problems with this approach:
- the fields in AVCodecContext are in general one of
* stream parameters
* codec options
* codec state
However, it's not clear which ones are which. It is consequently
unclear which fields are a demuxer allowed to set or a muxer allowed to
read. This leads to erratic behaviour depending on whether decoding or
encoding is being performed or not (and whether it uses the AVStream
embedded codec context).
- various synchronization issues arising from the fact that the same
context is used by several different APIs (muxers/demuxers,
parsers, bitstream filters and encoders/decoders) simultaneously, with
there being no clear rules for who can modify what and the different
processes being typically delayed with respect to each other.
- avformat_find_stream_info() making it necessary to support opening
and closing a single codec context multiple times, thus
complicating the semantics of freeing various allocated objects in the
codec context.
Those problems are resolved by replacing the AVStream embedded codec
context with a newly added AVCodecParameters instance, which stores only
the stream parameters exported by the demuxers or read by the muxers.
2014-06-18 20:42:52 +02:00
|
|
|
st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
|
|
|
|
st->codecpar->codec_id = ff_codec_get_id(ff_codec_wav_tags, AV_RL16(p + 124));
|
|
|
|
st->codecpar->channels = AV_RL16(p + 126);
|
|
|
|
st->codecpar->sample_rate = AV_RL32(p + 128);
|
|
|
|
st->codecpar->bit_rate = AV_RL32(p + 132) * 8;
|
2006-05-12 01:07:22 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
ogm_packet(AVFormatContext *s, int idx)
|
|
|
|
{
|
2008-11-06 02:50:56 +01:00
|
|
|
struct ogg *ogg = s->priv_data;
|
|
|
|
struct ogg_stream *os = ogg->streams + idx;
|
2006-05-12 01:07:22 +02:00
|
|
|
uint8_t *p = os->buf + os->pstart;
|
|
|
|
int lb;
|
|
|
|
|
2007-11-11 22:56:18 +01:00
|
|
|
if(*p & 8)
|
2010-03-31 14:29:58 +02:00
|
|
|
os->pflags |= AV_PKT_FLAG_KEY;
|
2007-11-11 22:56:18 +01:00
|
|
|
|
2006-05-12 01:07:22 +02:00
|
|
|
lb = ((*p & 2) << 1) | ((*p >> 6) & 3);
|
|
|
|
os->pstart += lb + 1;
|
|
|
|
os->psize -= lb + 1;
|
|
|
|
|
2010-03-13 06:55:57 +01:00
|
|
|
while (lb--)
|
|
|
|
os->pduration += p[lb+1] << (lb*8);
|
|
|
|
|
2006-05-12 01:07:22 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-11-06 02:50:56 +01:00
|
|
|
const struct ogg_codec ff_ogm_video_codec = {
|
2006-05-12 01:07:22 +02:00
|
|
|
.magic = "\001video",
|
|
|
|
.magicsize = 6,
|
|
|
|
.header = ogm_header,
|
2009-12-12 21:18:43 +01:00
|
|
|
.packet = ogm_packet,
|
|
|
|
.granule_is_start = 1,
|
2012-09-20 01:01:43 +02:00
|
|
|
.nb_header = 2,
|
2006-05-12 01:07:22 +02:00
|
|
|
};
|
|
|
|
|
2008-11-06 02:50:56 +01:00
|
|
|
const struct ogg_codec ff_ogm_audio_codec = {
|
2006-05-12 01:07:22 +02:00
|
|
|
.magic = "\001audio",
|
|
|
|
.magicsize = 6,
|
|
|
|
.header = ogm_header,
|
2009-12-12 21:18:43 +01:00
|
|
|
.packet = ogm_packet,
|
|
|
|
.granule_is_start = 1,
|
2012-09-20 01:01:43 +02:00
|
|
|
.nb_header = 2,
|
2006-05-12 01:07:22 +02:00
|
|
|
};
|
|
|
|
|
2008-11-06 02:50:56 +01:00
|
|
|
const struct ogg_codec ff_ogm_text_codec = {
|
2008-01-31 23:30:55 +01:00
|
|
|
.magic = "\001text",
|
|
|
|
.magicsize = 5,
|
|
|
|
.header = ogm_header,
|
2009-12-12 21:18:43 +01:00
|
|
|
.packet = ogm_packet,
|
|
|
|
.granule_is_start = 1,
|
2012-09-20 01:01:43 +02:00
|
|
|
.nb_header = 2,
|
2008-01-31 23:30:55 +01:00
|
|
|
};
|
|
|
|
|
2008-11-06 02:50:56 +01:00
|
|
|
const struct ogg_codec ff_ogm_old_codec = {
|
2006-05-12 01:07:22 +02:00
|
|
|
.magic = "\001Direct Show Samples embedded in Ogg",
|
|
|
|
.magicsize = 35,
|
|
|
|
.header = ogm_dshow_header,
|
2009-12-12 21:18:43 +01:00
|
|
|
.packet = ogm_packet,
|
|
|
|
.granule_is_start = 1,
|
2012-09-20 01:01:43 +02:00
|
|
|
.nb_header = 1,
|
2006-05-12 01:07:22 +02:00
|
|
|
};
|