annotate oggparsespeex.c @ 5200:cd884511ec8b libavformat

Make packet interleaving in the muxer not scan through the whole buffer when simply appending at the end works. Much faster if one stream ends prematurely. Fixes issue1379.
author michael
date Wed, 16 Sep 2009 00:59:15 +0000
parents ab5ed34ed707
children 5de92e352cf9
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3023
61ea9e6ee162 Add support for speex in ogg
reimar
parents:
diff changeset
1 /*
61ea9e6ee162 Add support for speex in ogg
reimar
parents:
diff changeset
2 Copyright (C) 2008 Reimar Döffinger
61ea9e6ee162 Add support for speex in ogg
reimar
parents:
diff changeset
3
61ea9e6ee162 Add support for speex in ogg
reimar
parents:
diff changeset
4 Permission is hereby granted, free of charge, to any person
61ea9e6ee162 Add support for speex in ogg
reimar
parents:
diff changeset
5 obtaining a copy of this software and associated documentation
61ea9e6ee162 Add support for speex in ogg
reimar
parents:
diff changeset
6 files (the "Software"), to deal in the Software without
61ea9e6ee162 Add support for speex in ogg
reimar
parents:
diff changeset
7 restriction, including without limitation the rights to use, copy,
61ea9e6ee162 Add support for speex in ogg
reimar
parents:
diff changeset
8 modify, merge, publish, distribute, sublicense, and/or sell copies
61ea9e6ee162 Add support for speex in ogg
reimar
parents:
diff changeset
9 of the Software, and to permit persons to whom the Software is
61ea9e6ee162 Add support for speex in ogg
reimar
parents:
diff changeset
10 furnished to do so, subject to the following conditions:
61ea9e6ee162 Add support for speex in ogg
reimar
parents:
diff changeset
11
61ea9e6ee162 Add support for speex in ogg
reimar
parents:
diff changeset
12 The above copyright notice and this permission notice shall be
61ea9e6ee162 Add support for speex in ogg
reimar
parents:
diff changeset
13 included in all copies or substantial portions of the Software.
61ea9e6ee162 Add support for speex in ogg
reimar
parents:
diff changeset
14
61ea9e6ee162 Add support for speex in ogg
reimar
parents:
diff changeset
15 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
61ea9e6ee162 Add support for speex in ogg
reimar
parents:
diff changeset
16 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
61ea9e6ee162 Add support for speex in ogg
reimar
parents:
diff changeset
17 MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
61ea9e6ee162 Add support for speex in ogg
reimar
parents:
diff changeset
18 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
61ea9e6ee162 Add support for speex in ogg
reimar
parents:
diff changeset
19 HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
61ea9e6ee162 Add support for speex in ogg
reimar
parents:
diff changeset
20 WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
61ea9e6ee162 Add support for speex in ogg
reimar
parents:
diff changeset
21 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
61ea9e6ee162 Add support for speex in ogg
reimar
parents:
diff changeset
22 DEALINGS IN THE SOFTWARE.
61ea9e6ee162 Add support for speex in ogg
reimar
parents:
diff changeset
23 **/
61ea9e6ee162 Add support for speex in ogg
reimar
parents:
diff changeset
24
61ea9e6ee162 Add support for speex in ogg
reimar
parents:
diff changeset
25 #include <stdlib.h>
3286
6f61c3b36632 Use full path for #includes from another directory.
diego
parents: 3023
diff changeset
26 #include "libavutil/bswap.h"
6f61c3b36632 Use full path for #includes from another directory.
diego
parents: 3023
diff changeset
27 #include "libavutil/avstring.h"
4872
304a0ea063f0 Rename bitstream.h to get_bits.h.
stefano
parents: 4766
diff changeset
28 #include "libavcodec/get_bits.h"
3286
6f61c3b36632 Use full path for #includes from another directory.
diego
parents: 3023
diff changeset
29 #include "libavcodec/bytestream.h"
3023
61ea9e6ee162 Add support for speex in ogg
reimar
parents:
diff changeset
30 #include "avformat.h"
61ea9e6ee162 Add support for speex in ogg
reimar
parents:
diff changeset
31 #include "oggdec.h"
61ea9e6ee162 Add support for speex in ogg
reimar
parents:
diff changeset
32
61ea9e6ee162 Add support for speex in ogg
reimar
parents:
diff changeset
33 static int speex_header(AVFormatContext *s, int idx) {
4016
6cd006bc2de9 OGG: untypedef demuxer structs
mru
parents: 3770
diff changeset
34 struct ogg *ogg = s->priv_data;
6cd006bc2de9 OGG: untypedef demuxer structs
mru
parents: 3770
diff changeset
35 struct ogg_stream *os = ogg->streams + idx;
3023
61ea9e6ee162 Add support for speex in ogg
reimar
parents:
diff changeset
36 AVStream *st = s->streams[idx];
61ea9e6ee162 Add support for speex in ogg
reimar
parents:
diff changeset
37 uint8_t *p = os->buf + os->pstart;
61ea9e6ee162 Add support for speex in ogg
reimar
parents:
diff changeset
38
4765
6ab95f681099 Fix Speex header parsing in ogg demuxer
conrad
parents: 4016
diff changeset
39 if (os->seq > 1)
6ab95f681099 Fix Speex header parsing in ogg demuxer
conrad
parents: 4016
diff changeset
40 return 0;
3023
61ea9e6ee162 Add support for speex in ogg
reimar
parents:
diff changeset
41
4765
6ab95f681099 Fix Speex header parsing in ogg demuxer
conrad
parents: 4016
diff changeset
42 if (os->seq == 0) {
5152
ab5ed34ed707 Modify the Ogg/Speex demuxer and the libspeex decoder so that they always treat
jbr
parents: 5005
diff changeset
43 int frames_per_packet;
4766
6567b8869917 Reindent
conrad
parents: 4765
diff changeset
44 st->codec->codec_type = CODEC_TYPE_AUDIO;
6567b8869917 Reindent
conrad
parents: 4765
diff changeset
45 st->codec->codec_id = CODEC_ID_SPEEX;
3023
61ea9e6ee162 Add support for speex in ogg
reimar
parents:
diff changeset
46
4766
6567b8869917 Reindent
conrad
parents: 4765
diff changeset
47 st->codec->sample_rate = AV_RL32(p + 36);
6567b8869917 Reindent
conrad
parents: 4765
diff changeset
48 st->codec->channels = AV_RL32(p + 48);
5152
ab5ed34ed707 Modify the Ogg/Speex demuxer and the libspeex decoder so that they always treat
jbr
parents: 5005
diff changeset
49
ab5ed34ed707 Modify the Ogg/Speex demuxer and the libspeex decoder so that they always treat
jbr
parents: 5005
diff changeset
50 /* We treat the whole Speex packet as a single frame everywhere Speex
ab5ed34ed707 Modify the Ogg/Speex demuxer and the libspeex decoder so that they always treat
jbr
parents: 5005
diff changeset
51 is handled in FFmpeg. This avoids the complexities of splitting
ab5ed34ed707 Modify the Ogg/Speex demuxer and the libspeex decoder so that they always treat
jbr
parents: 5005
diff changeset
52 and joining individual Speex frames, which are not always
ab5ed34ed707 Modify the Ogg/Speex demuxer and the libspeex decoder so that they always treat
jbr
parents: 5005
diff changeset
53 byte-aligned. */
4948
09e81ac02d25 Set speex frame_size in ogg demuxer
conrad
parents: 4872
diff changeset
54 st->codec->frame_size = AV_RL32(p + 56);
5152
ab5ed34ed707 Modify the Ogg/Speex demuxer and the libspeex decoder so that they always treat
jbr
parents: 5005
diff changeset
55 frames_per_packet = AV_RL32(p + 64);
ab5ed34ed707 Modify the Ogg/Speex demuxer and the libspeex decoder so that they always treat
jbr
parents: 5005
diff changeset
56 if (frames_per_packet)
ab5ed34ed707 Modify the Ogg/Speex demuxer and the libspeex decoder so that they always treat
jbr
parents: 5005
diff changeset
57 st->codec->frame_size *= frames_per_packet;
ab5ed34ed707 Modify the Ogg/Speex demuxer and the libspeex decoder so that they always treat
jbr
parents: 5005
diff changeset
58
4766
6567b8869917 Reindent
conrad
parents: 4765
diff changeset
59 st->codec->extradata_size = os->psize;
5005
53092c7684a2 Ensure that the extradata buffer is padded appripriately in the ogg demuxer.
conrad
parents: 4948
diff changeset
60 st->codec->extradata = av_malloc(st->codec->extradata_size
53092c7684a2 Ensure that the extradata buffer is padded appripriately in the ogg demuxer.
conrad
parents: 4948
diff changeset
61 + FF_INPUT_BUFFER_PADDING_SIZE);
4766
6567b8869917 Reindent
conrad
parents: 4765
diff changeset
62 memcpy(st->codec->extradata, p, st->codec->extradata_size);
3023
61ea9e6ee162 Add support for speex in ogg
reimar
parents:
diff changeset
63
4766
6567b8869917 Reindent
conrad
parents: 4765
diff changeset
64 st->time_base.num = 1;
6567b8869917 Reindent
conrad
parents: 4765
diff changeset
65 st->time_base.den = st->codec->sample_rate;
4765
6ab95f681099 Fix Speex header parsing in ogg demuxer
conrad
parents: 4016
diff changeset
66 } else
6ab95f681099 Fix Speex header parsing in ogg demuxer
conrad
parents: 4016
diff changeset
67 vorbis_comment(s, p, os->psize);
3023
61ea9e6ee162 Add support for speex in ogg
reimar
parents:
diff changeset
68
4765
6ab95f681099 Fix Speex header parsing in ogg demuxer
conrad
parents: 4016
diff changeset
69 return 1;
3023
61ea9e6ee162 Add support for speex in ogg
reimar
parents:
diff changeset
70 }
61ea9e6ee162 Add support for speex in ogg
reimar
parents:
diff changeset
71
4016
6cd006bc2de9 OGG: untypedef demuxer structs
mru
parents: 3770
diff changeset
72 const struct ogg_codec ff_speex_codec = {
3023
61ea9e6ee162 Add support for speex in ogg
reimar
parents:
diff changeset
73 .magic = "Speex ",
61ea9e6ee162 Add support for speex in ogg
reimar
parents:
diff changeset
74 .magicsize = 8,
61ea9e6ee162 Add support for speex in ogg
reimar
parents:
diff changeset
75 .header = speex_header
61ea9e6ee162 Add support for speex in ogg
reimar
parents:
diff changeset
76 };