annotate oggparsespeex.c @ 5349:d2cdd13aacff libavformat

Initialize block_parsed before reading first block header in WavPack demuxer, it will be useful later.
author kostya
date Thu, 05 Nov 2009 08:10:50 +0000
parents 5de92e352cf9
children 68c8e7affd44
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
5276
5de92e352cf9 Calculate correct packet durations when demuxing Ogg/Speex. This involves
jbr
parents: 5152
diff changeset
33 struct speex_params {
5de92e352cf9 Calculate correct packet durations when demuxing Ogg/Speex. This involves
jbr
parents: 5152
diff changeset
34 int final_packet_duration;
5de92e352cf9 Calculate correct packet durations when demuxing Ogg/Speex. This involves
jbr
parents: 5152
diff changeset
35 };
5de92e352cf9 Calculate correct packet durations when demuxing Ogg/Speex. This involves
jbr
parents: 5152
diff changeset
36
3023
61ea9e6ee162 Add support for speex in ogg
reimar
parents:
diff changeset
37 static int speex_header(AVFormatContext *s, int idx) {
4016
6cd006bc2de9 OGG: untypedef demuxer structs
mru
parents: 3770
diff changeset
38 struct ogg *ogg = s->priv_data;
6cd006bc2de9 OGG: untypedef demuxer structs
mru
parents: 3770
diff changeset
39 struct ogg_stream *os = ogg->streams + idx;
3023
61ea9e6ee162 Add support for speex in ogg
reimar
parents:
diff changeset
40 AVStream *st = s->streams[idx];
61ea9e6ee162 Add support for speex in ogg
reimar
parents:
diff changeset
41 uint8_t *p = os->buf + os->pstart;
61ea9e6ee162 Add support for speex in ogg
reimar
parents:
diff changeset
42
4765
6ab95f681099 Fix Speex header parsing in ogg demuxer
conrad
parents: 4016
diff changeset
43 if (os->seq > 1)
6ab95f681099 Fix Speex header parsing in ogg demuxer
conrad
parents: 4016
diff changeset
44 return 0;
3023
61ea9e6ee162 Add support for speex in ogg
reimar
parents:
diff changeset
45
4765
6ab95f681099 Fix Speex header parsing in ogg demuxer
conrad
parents: 4016
diff changeset
46 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
47 int frames_per_packet;
4766
6567b8869917 Reindent
conrad
parents: 4765
diff changeset
48 st->codec->codec_type = CODEC_TYPE_AUDIO;
6567b8869917 Reindent
conrad
parents: 4765
diff changeset
49 st->codec->codec_id = CODEC_ID_SPEEX;
3023
61ea9e6ee162 Add support for speex in ogg
reimar
parents:
diff changeset
50
4766
6567b8869917 Reindent
conrad
parents: 4765
diff changeset
51 st->codec->sample_rate = AV_RL32(p + 36);
6567b8869917 Reindent
conrad
parents: 4765
diff changeset
52 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
53
ab5ed34ed707 Modify the Ogg/Speex demuxer and the libspeex decoder so that they always treat
jbr
parents: 5005
diff changeset
54 /* 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
55 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
56 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
57 byte-aligned. */
4948
09e81ac02d25 Set speex frame_size in ogg demuxer
conrad
parents: 4872
diff changeset
58 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
59 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
60 if (frames_per_packet)
ab5ed34ed707 Modify the Ogg/Speex demuxer and the libspeex decoder so that they always treat
jbr
parents: 5005
diff changeset
61 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
62
4766
6567b8869917 Reindent
conrad
parents: 4765
diff changeset
63 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
64 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
65 + FF_INPUT_BUFFER_PADDING_SIZE);
4766
6567b8869917 Reindent
conrad
parents: 4765
diff changeset
66 memcpy(st->codec->extradata, p, st->codec->extradata_size);
3023
61ea9e6ee162 Add support for speex in ogg
reimar
parents:
diff changeset
67
4766
6567b8869917 Reindent
conrad
parents: 4765
diff changeset
68 st->time_base.num = 1;
6567b8869917 Reindent
conrad
parents: 4765
diff changeset
69 st->time_base.den = st->codec->sample_rate;
4765
6ab95f681099 Fix Speex header parsing in ogg demuxer
conrad
parents: 4016
diff changeset
70 } else
6ab95f681099 Fix Speex header parsing in ogg demuxer
conrad
parents: 4016
diff changeset
71 vorbis_comment(s, p, os->psize);
3023
61ea9e6ee162 Add support for speex in ogg
reimar
parents:
diff changeset
72
4765
6ab95f681099 Fix Speex header parsing in ogg demuxer
conrad
parents: 4016
diff changeset
73 return 1;
3023
61ea9e6ee162 Add support for speex in ogg
reimar
parents:
diff changeset
74 }
61ea9e6ee162 Add support for speex in ogg
reimar
parents:
diff changeset
75
5276
5de92e352cf9 Calculate correct packet durations when demuxing Ogg/Speex. This involves
jbr
parents: 5152
diff changeset
76 static int ogg_page_packets(struct ogg_stream *os)
5de92e352cf9 Calculate correct packet durations when demuxing Ogg/Speex. This involves
jbr
parents: 5152
diff changeset
77 {
5de92e352cf9 Calculate correct packet durations when demuxing Ogg/Speex. This involves
jbr
parents: 5152
diff changeset
78 int i;
5de92e352cf9 Calculate correct packet durations when demuxing Ogg/Speex. This involves
jbr
parents: 5152
diff changeset
79 int packets = 0;
5de92e352cf9 Calculate correct packet durations when demuxing Ogg/Speex. This involves
jbr
parents: 5152
diff changeset
80 for (i = 0; i < os->nsegs; i++)
5de92e352cf9 Calculate correct packet durations when demuxing Ogg/Speex. This involves
jbr
parents: 5152
diff changeset
81 if (os->segments[i] < 255)
5de92e352cf9 Calculate correct packet durations when demuxing Ogg/Speex. This involves
jbr
parents: 5152
diff changeset
82 packets++;
5de92e352cf9 Calculate correct packet durations when demuxing Ogg/Speex. This involves
jbr
parents: 5152
diff changeset
83 return packets;
5de92e352cf9 Calculate correct packet durations when demuxing Ogg/Speex. This involves
jbr
parents: 5152
diff changeset
84 }
5de92e352cf9 Calculate correct packet durations when demuxing Ogg/Speex. This involves
jbr
parents: 5152
diff changeset
85
5de92e352cf9 Calculate correct packet durations when demuxing Ogg/Speex. This involves
jbr
parents: 5152
diff changeset
86 static int speex_packet(AVFormatContext *s, int idx)
5de92e352cf9 Calculate correct packet durations when demuxing Ogg/Speex. This involves
jbr
parents: 5152
diff changeset
87 {
5de92e352cf9 Calculate correct packet durations when demuxing Ogg/Speex. This involves
jbr
parents: 5152
diff changeset
88 struct ogg *ogg = s->priv_data;
5de92e352cf9 Calculate correct packet durations when demuxing Ogg/Speex. This involves
jbr
parents: 5152
diff changeset
89 struct ogg_stream *os = ogg->streams + idx;
5de92e352cf9 Calculate correct packet durations when demuxing Ogg/Speex. This involves
jbr
parents: 5152
diff changeset
90 struct speex_params *spxp = os->private;
5de92e352cf9 Calculate correct packet durations when demuxing Ogg/Speex. This involves
jbr
parents: 5152
diff changeset
91 int packet_size = s->streams[idx]->codec->frame_size;
5de92e352cf9 Calculate correct packet durations when demuxing Ogg/Speex. This involves
jbr
parents: 5152
diff changeset
92
5de92e352cf9 Calculate correct packet durations when demuxing Ogg/Speex. This involves
jbr
parents: 5152
diff changeset
93 if (!spxp) {
5de92e352cf9 Calculate correct packet durations when demuxing Ogg/Speex. This involves
jbr
parents: 5152
diff changeset
94 spxp = av_mallocz(sizeof(*spxp));
5de92e352cf9 Calculate correct packet durations when demuxing Ogg/Speex. This involves
jbr
parents: 5152
diff changeset
95 os->private = spxp;
5de92e352cf9 Calculate correct packet durations when demuxing Ogg/Speex. This involves
jbr
parents: 5152
diff changeset
96 }
5de92e352cf9 Calculate correct packet durations when demuxing Ogg/Speex. This involves
jbr
parents: 5152
diff changeset
97
5de92e352cf9 Calculate correct packet durations when demuxing Ogg/Speex. This involves
jbr
parents: 5152
diff changeset
98 if (os->flags & OGG_FLAG_EOS && os->lastgp != -1 && os->granule > 0) {
5de92e352cf9 Calculate correct packet durations when demuxing Ogg/Speex. This involves
jbr
parents: 5152
diff changeset
99 /* first packet of final page. we have to calculate the final packet
5de92e352cf9 Calculate correct packet durations when demuxing Ogg/Speex. This involves
jbr
parents: 5152
diff changeset
100 duration here because it is the only place we know the next-to-last
5de92e352cf9 Calculate correct packet durations when demuxing Ogg/Speex. This involves
jbr
parents: 5152
diff changeset
101 granule position. */
5de92e352cf9 Calculate correct packet durations when demuxing Ogg/Speex. This involves
jbr
parents: 5152
diff changeset
102 spxp->final_packet_duration = os->granule - os->lastgp -
5de92e352cf9 Calculate correct packet durations when demuxing Ogg/Speex. This involves
jbr
parents: 5152
diff changeset
103 packet_size * (ogg_page_packets(os) - 1);
5de92e352cf9 Calculate correct packet durations when demuxing Ogg/Speex. This involves
jbr
parents: 5152
diff changeset
104 }
5de92e352cf9 Calculate correct packet durations when demuxing Ogg/Speex. This involves
jbr
parents: 5152
diff changeset
105
5de92e352cf9 Calculate correct packet durations when demuxing Ogg/Speex. This involves
jbr
parents: 5152
diff changeset
106 if (!os->lastgp && os->granule > 0)
5de92e352cf9 Calculate correct packet durations when demuxing Ogg/Speex. This involves
jbr
parents: 5152
diff changeset
107 /* first packet */
5de92e352cf9 Calculate correct packet durations when demuxing Ogg/Speex. This involves
jbr
parents: 5152
diff changeset
108 os->pduration = os->granule - packet_size * (ogg_page_packets(os) - 1);
5de92e352cf9 Calculate correct packet durations when demuxing Ogg/Speex. This involves
jbr
parents: 5152
diff changeset
109 else if (os->flags & OGG_FLAG_EOS && os->segp == os->nsegs &&
5de92e352cf9 Calculate correct packet durations when demuxing Ogg/Speex. This involves
jbr
parents: 5152
diff changeset
110 spxp->final_packet_duration)
5de92e352cf9 Calculate correct packet durations when demuxing Ogg/Speex. This involves
jbr
parents: 5152
diff changeset
111 /* final packet */
5de92e352cf9 Calculate correct packet durations when demuxing Ogg/Speex. This involves
jbr
parents: 5152
diff changeset
112 os->pduration = spxp->final_packet_duration;
5de92e352cf9 Calculate correct packet durations when demuxing Ogg/Speex. This involves
jbr
parents: 5152
diff changeset
113 else
5de92e352cf9 Calculate correct packet durations when demuxing Ogg/Speex. This involves
jbr
parents: 5152
diff changeset
114 os->pduration = packet_size;
5de92e352cf9 Calculate correct packet durations when demuxing Ogg/Speex. This involves
jbr
parents: 5152
diff changeset
115
5de92e352cf9 Calculate correct packet durations when demuxing Ogg/Speex. This involves
jbr
parents: 5152
diff changeset
116 return 0;
5de92e352cf9 Calculate correct packet durations when demuxing Ogg/Speex. This involves
jbr
parents: 5152
diff changeset
117 }
5de92e352cf9 Calculate correct packet durations when demuxing Ogg/Speex. This involves
jbr
parents: 5152
diff changeset
118
4016
6cd006bc2de9 OGG: untypedef demuxer structs
mru
parents: 3770
diff changeset
119 const struct ogg_codec ff_speex_codec = {
3023
61ea9e6ee162 Add support for speex in ogg
reimar
parents:
diff changeset
120 .magic = "Speex ",
61ea9e6ee162 Add support for speex in ogg
reimar
parents:
diff changeset
121 .magicsize = 8,
5276
5de92e352cf9 Calculate correct packet durations when demuxing Ogg/Speex. This involves
jbr
parents: 5152
diff changeset
122 .header = speex_header,
5de92e352cf9 Calculate correct packet durations when demuxing Ogg/Speex. This involves
jbr
parents: 5152
diff changeset
123 .packet = speex_packet
3023
61ea9e6ee162 Add support for speex in ogg
reimar
parents:
diff changeset
124 };