annotate oggparsevorbis.c @ 5747:551765b1772b libavformat

Ensure that we write clusters and blocks with known size when streaming Too many demuxers can't cope with clusters of unknown size.
author conrad
date Thu, 04 Mar 2010 08:53:14 +0000
parents 27fd77f20a89
children e993cab1faf3
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
726
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
1 /**
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
2 Copyright (C) 2005 Michael Ahlberg, Måns Rullgård
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
3
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
4 Permission is hereby granted, free of charge, to any person
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
5 obtaining a copy of this software and associated documentation
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
6 files (the "Software"), to deal in the Software without
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
7 restriction, including without limitation the rights to use, copy,
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
8 modify, merge, publish, distribute, sublicense, and/or sell copies
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
9 of the Software, and to permit persons to whom the Software is
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
10 furnished to do so, subject to the following conditions:
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
11
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
12 The above copyright notice and this permission notice shall be
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
13 included in all copies or substantial portions of the Software.
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
14
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
15 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
16 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
17 MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
18 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
19 HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
20 WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
21 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
22 DEALINGS IN THE SOFTWARE.
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
23 **/
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
24
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
25 #include <stdlib.h>
3286
6f61c3b36632 Use full path for #includes from another directory.
diego
parents: 2996
diff changeset
26 #include "libavutil/avstring.h"
6f61c3b36632 Use full path for #includes from another directory.
diego
parents: 2996
diff changeset
27 #include "libavutil/bswap.h"
4872
304a0ea063f0 Rename bitstream.h to get_bits.h.
stefano
parents: 4466
diff changeset
28 #include "libavcodec/get_bits.h"
3286
6f61c3b36632 Use full path for #includes from another directory.
diego
parents: 2996
diff changeset
29 #include "libavcodec/bytestream.h"
726
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
30 #include "avformat.h"
2714
b22ba392ac21 Rename ogg2.[ch] to oggdec.[ch].
diego
parents: 2601
diff changeset
31 #include "oggdec.h"
726
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
32
5032
3aabdadf9d5f Add a VorbisComment metadata conversion table and use it in the FLAC and
jbr
parents: 4872
diff changeset
33 /**
3aabdadf9d5f Add a VorbisComment metadata conversion table and use it in the FLAC and
jbr
parents: 4872
diff changeset
34 * VorbisComment metadata conversion mapping.
3aabdadf9d5f Add a VorbisComment metadata conversion table and use it in the FLAC and
jbr
parents: 4872
diff changeset
35 * from Ogg Vorbis I format specification: comment field and header specification
3aabdadf9d5f Add a VorbisComment metadata conversion table and use it in the FLAC and
jbr
parents: 4872
diff changeset
36 * http://xiph.org/vorbis/doc/v-comment.html
3aabdadf9d5f Add a VorbisComment metadata conversion table and use it in the FLAC and
jbr
parents: 4872
diff changeset
37 */
3aabdadf9d5f Add a VorbisComment metadata conversion table and use it in the FLAC and
jbr
parents: 4872
diff changeset
38 const AVMetadataConv ff_vorbiscomment_metadata_conv[] = {
5618
27fd77f20a89 Add a list of generic tags and change demuxers to follow it.
pross
parents: 5446
diff changeset
39 { "ALBUMARTIST", "album_artist"},
5032
3aabdadf9d5f Add a VorbisComment metadata conversion table and use it in the FLAC and
jbr
parents: 4872
diff changeset
40 { "TRACKNUMBER", "track" },
3aabdadf9d5f Add a VorbisComment metadata conversion table and use it in the FLAC and
jbr
parents: 4872
diff changeset
41 { 0 }
3aabdadf9d5f Add a VorbisComment metadata conversion table and use it in the FLAC and
jbr
parents: 4872
diff changeset
42 };
3aabdadf9d5f Add a VorbisComment metadata conversion table and use it in the FLAC and
jbr
parents: 4872
diff changeset
43
4058
dcdf236c9909 Delete unnecessary 'extern' keywords.
diego
parents: 4016
diff changeset
44 int
2197
94d11eaef9bf whitespace cosmetics
mru
parents: 2196
diff changeset
45 vorbis_comment(AVFormatContext * as, uint8_t *buf, int size)
726
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
46 {
2996
bcoudurier
parents: 2714
diff changeset
47 const uint8_t *p = buf;
bcoudurier
parents: 2714
diff changeset
48 const uint8_t *end = buf + size;
5232
ee0eaff74dd3 Fix possible buffer over-read in vorbis_comment, fix it double to be sure.
reimar
parents: 5228
diff changeset
49 unsigned n, j;
ee0eaff74dd3 Fix possible buffer over-read in vorbis_comment, fix it double to be sure.
reimar
parents: 5228
diff changeset
50 int s;
726
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
51
2595
f9cfd91f344a fix buffer overread with invalid Vorbis header
mru
parents: 2594
diff changeset
52 if (size < 8) /* must have vendor_length and user_comment_list_length */
726
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
53 return -1;
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
54
2600
a004bd730f70 use bytestream_get_* in vorbis_comment()
mru
parents: 2597
diff changeset
55 s = bytestream_get_le32(&p);
726
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
56
5232
ee0eaff74dd3 Fix possible buffer over-read in vorbis_comment, fix it double to be sure.
reimar
parents: 5228
diff changeset
57 if (end - p - 4 < s || s < 0)
726
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
58 return -1;
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
59
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
60 p += s;
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
61
2600
a004bd730f70 use bytestream_get_* in vorbis_comment()
mru
parents: 2597
diff changeset
62 n = bytestream_get_le32(&p);
726
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
63
5232
ee0eaff74dd3 Fix possible buffer over-read in vorbis_comment, fix it double to be sure.
reimar
parents: 5228
diff changeset
64 while (end - p >= 4 && n > 0) {
2996
bcoudurier
parents: 2714
diff changeset
65 const char *t, *v;
726
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
66 int tl, vl;
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
67
2600
a004bd730f70 use bytestream_get_* in vorbis_comment()
mru
parents: 2597
diff changeset
68 s = bytestream_get_le32(&p);
726
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
69
5232
ee0eaff74dd3 Fix possible buffer over-read in vorbis_comment, fix it double to be sure.
reimar
parents: 5228
diff changeset
70 if (end - p < s || s < 0)
726
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
71 break;
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
72
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
73 t = p;
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
74 p += s;
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
75 n--;
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
76
2197
94d11eaef9bf whitespace cosmetics
mru
parents: 2196
diff changeset
77 v = memchr(t, '=', s);
726
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
78 if (!v)
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
79 continue;
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
80
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
81 tl = v - t;
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
82 vl = s - tl - 1;
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
83 v++;
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
84
2197
94d11eaef9bf whitespace cosmetics
mru
parents: 2196
diff changeset
85 if (tl && vl) {
4466
ad9324c36a3f use av_malloc() in vorbis_comment()
jbr
parents: 4455
diff changeset
86 char *tt, *ct;
ad9324c36a3f use av_malloc() in vorbis_comment()
jbr
parents: 4455
diff changeset
87
ad9324c36a3f use av_malloc() in vorbis_comment()
jbr
parents: 4455
diff changeset
88 tt = av_malloc(tl + 1);
ad9324c36a3f use av_malloc() in vorbis_comment()
jbr
parents: 4455
diff changeset
89 ct = av_malloc(vl + 1);
ad9324c36a3f use av_malloc() in vorbis_comment()
jbr
parents: 4455
diff changeset
90 if (!tt || !ct) {
ad9324c36a3f use av_malloc() in vorbis_comment()
jbr
parents: 4455
diff changeset
91 av_freep(&tt);
ad9324c36a3f use av_malloc() in vorbis_comment()
jbr
parents: 4455
diff changeset
92 av_freep(&ct);
ad9324c36a3f use av_malloc() in vorbis_comment()
jbr
parents: 4455
diff changeset
93 av_log(as, AV_LOG_WARNING, "out-of-memory error. skipping VorbisComment tag.\n");
ad9324c36a3f use av_malloc() in vorbis_comment()
jbr
parents: 4455
diff changeset
94 continue;
ad9324c36a3f use av_malloc() in vorbis_comment()
jbr
parents: 4455
diff changeset
95 }
726
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
96
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
97 for (j = 0; j < tl; j++)
2197
94d11eaef9bf whitespace cosmetics
mru
parents: 2196
diff changeset
98 tt[j] = toupper(t[j]);
726
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
99 tt[tl] = 0;
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
100
2197
94d11eaef9bf whitespace cosmetics
mru
parents: 2196
diff changeset
101 memcpy(ct, v, vl);
726
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
102 ct[vl] = 0;
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
103
5446
4211f91f69b1 Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents: 5294
diff changeset
104 av_metadata_set2(&as->metadata, tt, ct,
4211f91f69b1 Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents: 5294
diff changeset
105 AV_METADATA_DONT_STRDUP_KEY |
4211f91f69b1 Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents: 5294
diff changeset
106 AV_METADATA_DONT_STRDUP_VAL);
726
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
107 }
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
108 }
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
109
2601
b86ce6737811 simply buffer checks in vorbis_comment()
mru
parents: 2600
diff changeset
110 if (p != end)
5228
a59767d33928 Correctly print number of remaining bytes in oggparsevorbis instead of always
reimar
parents: 5032
diff changeset
111 av_log(as, AV_LOG_INFO, "%ti bytes of comment header remain\n", end-p);
726
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
112 if (n > 0)
2197
94d11eaef9bf whitespace cosmetics
mru
parents: 2196
diff changeset
113 av_log(as, AV_LOG_INFO,
94d11eaef9bf whitespace cosmetics
mru
parents: 2196
diff changeset
114 "truncated comment header, %i comments not found\n", n);
726
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
115
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
116 return 0;
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
117 }
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
118
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
119
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
120 /** Parse the vorbis header
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
121 * Vorbis Identification header from Vorbis_I_spec.html#vorbis-spec-codec
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
122 * [vorbis_version] = read 32 bits as unsigned integer | Not used
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
123 * [audio_channels] = read 8 bit integer as unsigned | Used
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 820
diff changeset
124 * [audio_sample_rate] = read 32 bits as unsigned integer | Used
726
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
125 * [bitrate_maximum] = read 32 bits as signed integer | Not used yet
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
126 * [bitrate_nominal] = read 32 bits as signed integer | Not used yet
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
127 * [bitrate_minimum] = read 32 bits as signed integer | Used as bitrate
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
128 * [blocksize_0] = read 4 bits as unsigned integer | Not Used
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
129 * [blocksize_1] = read 4 bits as unsigned integer | Not Used
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
130 * [framing_flag] = read one bit | Not Used
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
131 * */
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
132
4016
6cd006bc2de9 OGG: untypedef demuxer structs
mru
parents: 3770
diff changeset
133 struct oggvorbis_private {
760
c72bba158baa change extradata format for vorbis
mru
parents: 729
diff changeset
134 unsigned int len[3];
c72bba158baa change extradata format for vorbis
mru
parents: 729
diff changeset
135 unsigned char *packet[3];
4016
6cd006bc2de9 OGG: untypedef demuxer structs
mru
parents: 3770
diff changeset
136 };
760
c72bba158baa change extradata format for vorbis
mru
parents: 729
diff changeset
137
c72bba158baa change extradata format for vorbis
mru
parents: 729
diff changeset
138
c72bba158baa change extradata format for vorbis
mru
parents: 729
diff changeset
139 static unsigned int
4016
6cd006bc2de9 OGG: untypedef demuxer structs
mru
parents: 3770
diff changeset
140 fixup_vorbis_headers(AVFormatContext * as, struct oggvorbis_private *priv,
2198
7c13baaa4f87 warnings--
mru
parents: 2197
diff changeset
141 uint8_t **buf)
760
c72bba158baa change extradata format for vorbis
mru
parents: 729
diff changeset
142 {
c72bba158baa change extradata format for vorbis
mru
parents: 729
diff changeset
143 int i,offset, len;
c72bba158baa change extradata format for vorbis
mru
parents: 729
diff changeset
144 unsigned char *ptr;
c72bba158baa change extradata format for vorbis
mru
parents: 729
diff changeset
145
c72bba158baa change extradata format for vorbis
mru
parents: 729
diff changeset
146 len = priv->len[0] + priv->len[1] + priv->len[2];
c72bba158baa change extradata format for vorbis
mru
parents: 729
diff changeset
147 ptr = *buf = av_mallocz(len + len/255 + 64);
c72bba158baa change extradata format for vorbis
mru
parents: 729
diff changeset
148
c72bba158baa change extradata format for vorbis
mru
parents: 729
diff changeset
149 ptr[0] = 2;
c72bba158baa change extradata format for vorbis
mru
parents: 729
diff changeset
150 offset = 1;
c72bba158baa change extradata format for vorbis
mru
parents: 729
diff changeset
151 offset += av_xiphlacing(&ptr[offset], priv->len[0]);
c72bba158baa change extradata format for vorbis
mru
parents: 729
diff changeset
152 offset += av_xiphlacing(&ptr[offset], priv->len[1]);
2197
94d11eaef9bf whitespace cosmetics
mru
parents: 2196
diff changeset
153 for (i = 0; i < 3; i++) {
760
c72bba158baa change extradata format for vorbis
mru
parents: 729
diff changeset
154 memcpy(&ptr[offset], priv->packet[i], priv->len[i]);
c72bba158baa change extradata format for vorbis
mru
parents: 729
diff changeset
155 offset += priv->len[i];
c72bba158baa change extradata format for vorbis
mru
parents: 729
diff changeset
156 }
3584
c3c1b9302005 OGG: Add padding at end of Vorbis headers
mru
parents: 3286
diff changeset
157 *buf = av_realloc(*buf, offset + FF_INPUT_BUFFER_PADDING_SIZE);
760
c72bba158baa change extradata format for vorbis
mru
parents: 729
diff changeset
158 return offset;
c72bba158baa change extradata format for vorbis
mru
parents: 729
diff changeset
159 }
c72bba158baa change extradata format for vorbis
mru
parents: 729
diff changeset
160
c72bba158baa change extradata format for vorbis
mru
parents: 729
diff changeset
161
726
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
162 static int
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
163 vorbis_header (AVFormatContext * s, int idx)
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
164 {
4016
6cd006bc2de9 OGG: untypedef demuxer structs
mru
parents: 3770
diff changeset
165 struct ogg *ogg = s->priv_data;
6cd006bc2de9 OGG: untypedef demuxer structs
mru
parents: 3770
diff changeset
166 struct ogg_stream *os = ogg->streams + idx;
726
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
167 AVStream *st = s->streams[idx];
4016
6cd006bc2de9 OGG: untypedef demuxer structs
mru
parents: 3770
diff changeset
168 struct oggvorbis_private *priv;
726
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
169
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
170 if (os->seq > 2)
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
171 return 0;
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
172
2197
94d11eaef9bf whitespace cosmetics
mru
parents: 2196
diff changeset
173 if (os->seq == 0) {
4016
6cd006bc2de9 OGG: untypedef demuxer structs
mru
parents: 3770
diff changeset
174 os->private = av_mallocz(sizeof(struct oggvorbis_private));
2197
94d11eaef9bf whitespace cosmetics
mru
parents: 2196
diff changeset
175 if (!os->private)
760
c72bba158baa change extradata format for vorbis
mru
parents: 729
diff changeset
176 return 0;
c72bba158baa change extradata format for vorbis
mru
parents: 729
diff changeset
177 }
726
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
178
2595
f9cfd91f344a fix buffer overread with invalid Vorbis header
mru
parents: 2594
diff changeset
179 if (os->psize < 1)
f9cfd91f344a fix buffer overread with invalid Vorbis header
mru
parents: 2594
diff changeset
180 return -1;
f9cfd91f344a fix buffer overread with invalid Vorbis header
mru
parents: 2594
diff changeset
181
760
c72bba158baa change extradata format for vorbis
mru
parents: 729
diff changeset
182 priv = os->private;
c72bba158baa change extradata format for vorbis
mru
parents: 729
diff changeset
183 priv->len[os->seq] = os->psize;
c72bba158baa change extradata format for vorbis
mru
parents: 729
diff changeset
184 priv->packet[os->seq] = av_mallocz(os->psize);
c72bba158baa change extradata format for vorbis
mru
parents: 729
diff changeset
185 memcpy(priv->packet[os->seq], os->buf + os->pstart, os->psize);
726
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
186 if (os->buf[os->pstart] == 1) {
2996
bcoudurier
parents: 2714
diff changeset
187 const uint8_t *p = os->buf + os->pstart + 7; /* skip "\001vorbis" tag */
2597
eb7808a9d361 check values more thoroughly in vorbis_header()
mru
parents: 2596
diff changeset
188 unsigned blocksize, bs0, bs1;
2595
f9cfd91f344a fix buffer overread with invalid Vorbis header
mru
parents: 2594
diff changeset
189
f9cfd91f344a fix buffer overread with invalid Vorbis header
mru
parents: 2594
diff changeset
190 if (os->psize != 30)
f9cfd91f344a fix buffer overread with invalid Vorbis header
mru
parents: 2594
diff changeset
191 return -1;
f9cfd91f344a fix buffer overread with invalid Vorbis header
mru
parents: 2594
diff changeset
192
2597
eb7808a9d361 check values more thoroughly in vorbis_header()
mru
parents: 2596
diff changeset
193 if (bytestream_get_le32(&p) != 0) /* vorbis_version */
eb7808a9d361 check values more thoroughly in vorbis_header()
mru
parents: 2596
diff changeset
194 return -1;
eb7808a9d361 check values more thoroughly in vorbis_header()
mru
parents: 2596
diff changeset
195
2596
9e91148f1d44 use bytestream_get_* in vorbis_header()
mru
parents: 2595
diff changeset
196 st->codec->channels = bytestream_get_byte(&p);
9e91148f1d44 use bytestream_get_* in vorbis_header()
mru
parents: 2595
diff changeset
197 st->codec->sample_rate = bytestream_get_le32(&p);
9e91148f1d44 use bytestream_get_* in vorbis_header()
mru
parents: 2595
diff changeset
198 p += 4; // skip maximum bitrate
9e91148f1d44 use bytestream_get_* in vorbis_header()
mru
parents: 2595
diff changeset
199 st->codec->bit_rate = bytestream_get_le32(&p); // nominal bitrate
2597
eb7808a9d361 check values more thoroughly in vorbis_header()
mru
parents: 2596
diff changeset
200 p += 4; // skip minimum bitrate
eb7808a9d361 check values more thoroughly in vorbis_header()
mru
parents: 2596
diff changeset
201
eb7808a9d361 check values more thoroughly in vorbis_header()
mru
parents: 2596
diff changeset
202 blocksize = bytestream_get_byte(&p);
eb7808a9d361 check values more thoroughly in vorbis_header()
mru
parents: 2596
diff changeset
203 bs0 = blocksize & 15;
eb7808a9d361 check values more thoroughly in vorbis_header()
mru
parents: 2596
diff changeset
204 bs1 = blocksize >> 4;
eb7808a9d361 check values more thoroughly in vorbis_header()
mru
parents: 2596
diff changeset
205
eb7808a9d361 check values more thoroughly in vorbis_header()
mru
parents: 2596
diff changeset
206 if (bs0 > bs1)
eb7808a9d361 check values more thoroughly in vorbis_header()
mru
parents: 2596
diff changeset
207 return -1;
eb7808a9d361 check values more thoroughly in vorbis_header()
mru
parents: 2596
diff changeset
208 if (bs0 < 6 || bs1 > 13)
eb7808a9d361 check values more thoroughly in vorbis_header()
mru
parents: 2596
diff changeset
209 return -1;
eb7808a9d361 check values more thoroughly in vorbis_header()
mru
parents: 2596
diff changeset
210
eb7808a9d361 check values more thoroughly in vorbis_header()
mru
parents: 2596
diff changeset
211 if (bytestream_get_byte(&p) != 1) /* framing_flag */
eb7808a9d361 check values more thoroughly in vorbis_header()
mru
parents: 2596
diff changeset
212 return -1;
726
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
213
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 760
diff changeset
214 st->codec->codec_type = CODEC_TYPE_AUDIO;
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 760
diff changeset
215 st->codec->codec_id = CODEC_ID_VORBIS;
726
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
216
1077
91677ac6fb19 set stream time_base properly
mru
parents: 885
diff changeset
217 st->time_base.num = 1;
91677ac6fb19 set stream time_base properly
mru
parents: 885
diff changeset
218 st->time_base.den = st->codec->sample_rate;
726
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
219 } else if (os->buf[os->pstart] == 3) {
2595
f9cfd91f344a fix buffer overread with invalid Vorbis header
mru
parents: 2594
diff changeset
220 if (os->psize > 8)
f9cfd91f344a fix buffer overread with invalid Vorbis header
mru
parents: 2594
diff changeset
221 vorbis_comment (s, os->buf + os->pstart + 7, os->psize - 8);
760
c72bba158baa change extradata format for vorbis
mru
parents: 729
diff changeset
222 } else {
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 760
diff changeset
223 st->codec->extradata_size =
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 760
diff changeset
224 fixup_vorbis_headers(s, priv, &st->codec->extradata);
726
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
225 }
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
226
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
227 return os->seq < 3;
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
228 }
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
229
4016
6cd006bc2de9 OGG: untypedef demuxer structs
mru
parents: 3770
diff changeset
230 const struct ogg_codec ff_vorbis_codec = {
726
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
231 .magic = "\001vorbis",
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
232 .magicsize = 7,
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
233 .header = vorbis_header
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
234 };