annotate oggparsevorbis.c @ 5948:dc1a033edd9f libavformat

Do not set pos to an error value. Patch by Howard Chu, hyc highlandsun com
author cehoyos
date Mon, 12 Apr 2010 15:03:30 +0000
parents 536e5527c1e0
children 05a6d7c6813e
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
5828
925e7a7b3227 oggdec: Parse ogm chapters
conrad
parents: 5825
diff changeset
33 static int ogm_chapter(AVFormatContext *as, uint8_t *key, uint8_t *val)
925e7a7b3227 oggdec: Parse ogm chapters
conrad
parents: 5825
diff changeset
34 {
925e7a7b3227 oggdec: Parse ogm chapters
conrad
parents: 5825
diff changeset
35 int i, cnum, h, m, s, ms, keylen = strlen(key);
925e7a7b3227 oggdec: Parse ogm chapters
conrad
parents: 5825
diff changeset
36 AVChapter *chapter = NULL;
925e7a7b3227 oggdec: Parse ogm chapters
conrad
parents: 5825
diff changeset
37
925e7a7b3227 oggdec: Parse ogm chapters
conrad
parents: 5825
diff changeset
38 if (keylen < 9 || sscanf(key, "CHAPTER%02d", &cnum) != 1)
925e7a7b3227 oggdec: Parse ogm chapters
conrad
parents: 5825
diff changeset
39 return 0;
925e7a7b3227 oggdec: Parse ogm chapters
conrad
parents: 5825
diff changeset
40
925e7a7b3227 oggdec: Parse ogm chapters
conrad
parents: 5825
diff changeset
41 if (keylen == 9) {
925e7a7b3227 oggdec: Parse ogm chapters
conrad
parents: 5825
diff changeset
42 if (sscanf(val, "%02d:%02d:%02d.%03d", &h, &m, &s, &ms) < 4)
925e7a7b3227 oggdec: Parse ogm chapters
conrad
parents: 5825
diff changeset
43 return 0;
925e7a7b3227 oggdec: Parse ogm chapters
conrad
parents: 5825
diff changeset
44
925e7a7b3227 oggdec: Parse ogm chapters
conrad
parents: 5825
diff changeset
45 ff_new_chapter(as, cnum, (AVRational){1,1000},
925e7a7b3227 oggdec: Parse ogm chapters
conrad
parents: 5825
diff changeset
46 ms + 1000*(s + 60*(m + 60*h)),
925e7a7b3227 oggdec: Parse ogm chapters
conrad
parents: 5825
diff changeset
47 AV_NOPTS_VALUE, NULL);
925e7a7b3227 oggdec: Parse ogm chapters
conrad
parents: 5825
diff changeset
48 av_free(val);
925e7a7b3227 oggdec: Parse ogm chapters
conrad
parents: 5825
diff changeset
49 } else if (!strcmp(key+9, "NAME")) {
925e7a7b3227 oggdec: Parse ogm chapters
conrad
parents: 5825
diff changeset
50 for(i = 0; i < as->nb_chapters; i++)
925e7a7b3227 oggdec: Parse ogm chapters
conrad
parents: 5825
diff changeset
51 if (as->chapters[i]->id == cnum) {
925e7a7b3227 oggdec: Parse ogm chapters
conrad
parents: 5825
diff changeset
52 chapter = as->chapters[i];
925e7a7b3227 oggdec: Parse ogm chapters
conrad
parents: 5825
diff changeset
53 break;
925e7a7b3227 oggdec: Parse ogm chapters
conrad
parents: 5825
diff changeset
54 }
925e7a7b3227 oggdec: Parse ogm chapters
conrad
parents: 5825
diff changeset
55 if (!chapter)
925e7a7b3227 oggdec: Parse ogm chapters
conrad
parents: 5825
diff changeset
56 return 0;
925e7a7b3227 oggdec: Parse ogm chapters
conrad
parents: 5825
diff changeset
57
925e7a7b3227 oggdec: Parse ogm chapters
conrad
parents: 5825
diff changeset
58 av_metadata_set2(&chapter->metadata, "title", val,
925e7a7b3227 oggdec: Parse ogm chapters
conrad
parents: 5825
diff changeset
59 AV_METADATA_DONT_STRDUP_VAL);
925e7a7b3227 oggdec: Parse ogm chapters
conrad
parents: 5825
diff changeset
60 } else
925e7a7b3227 oggdec: Parse ogm chapters
conrad
parents: 5825
diff changeset
61 return 0;
925e7a7b3227 oggdec: Parse ogm chapters
conrad
parents: 5825
diff changeset
62
925e7a7b3227 oggdec: Parse ogm chapters
conrad
parents: 5825
diff changeset
63 av_free(key);
925e7a7b3227 oggdec: Parse ogm chapters
conrad
parents: 5825
diff changeset
64 return 1;
925e7a7b3227 oggdec: Parse ogm chapters
conrad
parents: 5825
diff changeset
65 }
925e7a7b3227 oggdec: Parse ogm chapters
conrad
parents: 5825
diff changeset
66
4058
dcdf236c9909 Delete unnecessary 'extern' keywords.
diego
parents: 4016
diff changeset
67 int
5825
4a67f1418e4c Const correctness for vorbis_comment
conrad
parents: 5824
diff changeset
68 ff_vorbis_comment(AVFormatContext * as, AVMetadata **m, const 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
69 {
2996
bcoudurier
parents: 2714
diff changeset
70 const uint8_t *p = buf;
bcoudurier
parents: 2714
diff changeset
71 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
72 unsigned n, j;
ee0eaff74dd3 Fix possible buffer over-read in vorbis_comment, fix it double to be sure.
reimar
parents: 5228
diff changeset
73 int s;
726
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
74
2595
f9cfd91f344a fix buffer overread with invalid Vorbis header
mru
parents: 2594
diff changeset
75 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
76 return -1;
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
77
2600
a004bd730f70 use bytestream_get_* in vorbis_comment()
mru
parents: 2597
diff changeset
78 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
79
5232
ee0eaff74dd3 Fix possible buffer over-read in vorbis_comment, fix it double to be sure.
reimar
parents: 5228
diff changeset
80 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
81 return -1;
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
82
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
83 p += s;
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
84
2600
a004bd730f70 use bytestream_get_* in vorbis_comment()
mru
parents: 2597
diff changeset
85 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
86
5232
ee0eaff74dd3 Fix possible buffer over-read in vorbis_comment, fix it double to be sure.
reimar
parents: 5228
diff changeset
87 while (end - p >= 4 && n > 0) {
2996
bcoudurier
parents: 2714
diff changeset
88 const char *t, *v;
726
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
89 int tl, vl;
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
90
2600
a004bd730f70 use bytestream_get_* in vorbis_comment()
mru
parents: 2597
diff changeset
91 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
92
5232
ee0eaff74dd3 Fix possible buffer over-read in vorbis_comment, fix it double to be sure.
reimar
parents: 5228
diff changeset
93 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
94 break;
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
95
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
96 t = p;
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
97 p += s;
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
98 n--;
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
99
2197
94d11eaef9bf whitespace cosmetics
mru
parents: 2196
diff changeset
100 v = memchr(t, '=', s);
726
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
101 if (!v)
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
102 continue;
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
103
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
104 tl = v - t;
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
105 vl = s - tl - 1;
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
106 v++;
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
107
2197
94d11eaef9bf whitespace cosmetics
mru
parents: 2196
diff changeset
108 if (tl && vl) {
4466
ad9324c36a3f use av_malloc() in vorbis_comment()
jbr
parents: 4455
diff changeset
109 char *tt, *ct;
ad9324c36a3f use av_malloc() in vorbis_comment()
jbr
parents: 4455
diff changeset
110
ad9324c36a3f use av_malloc() in vorbis_comment()
jbr
parents: 4455
diff changeset
111 tt = av_malloc(tl + 1);
ad9324c36a3f use av_malloc() in vorbis_comment()
jbr
parents: 4455
diff changeset
112 ct = av_malloc(vl + 1);
ad9324c36a3f use av_malloc() in vorbis_comment()
jbr
parents: 4455
diff changeset
113 if (!tt || !ct) {
ad9324c36a3f use av_malloc() in vorbis_comment()
jbr
parents: 4455
diff changeset
114 av_freep(&tt);
ad9324c36a3f use av_malloc() in vorbis_comment()
jbr
parents: 4455
diff changeset
115 av_freep(&ct);
ad9324c36a3f use av_malloc() in vorbis_comment()
jbr
parents: 4455
diff changeset
116 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
117 continue;
ad9324c36a3f use av_malloc() in vorbis_comment()
jbr
parents: 4455
diff changeset
118 }
726
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 for (j = 0; j < tl; j++)
2197
94d11eaef9bf whitespace cosmetics
mru
parents: 2196
diff changeset
121 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
122 tt[tl] = 0;
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
123
2197
94d11eaef9bf whitespace cosmetics
mru
parents: 2196
diff changeset
124 memcpy(ct, v, vl);
726
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
125 ct[vl] = 0;
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
126
5828
925e7a7b3227 oggdec: Parse ogm chapters
conrad
parents: 5825
diff changeset
127 if (!ogm_chapter(as, tt, ct))
925e7a7b3227 oggdec: Parse ogm chapters
conrad
parents: 5825
diff changeset
128 av_metadata_set2(m, tt, ct,
5446
4211f91f69b1 Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents: 5294
diff changeset
129 AV_METADATA_DONT_STRDUP_KEY |
4211f91f69b1 Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents: 5294
diff changeset
130 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
131 }
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
132 }
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
133
2601
b86ce6737811 simply buffer checks in vorbis_comment()
mru
parents: 2600
diff changeset
134 if (p != end)
5228
a59767d33928 Correctly print number of remaining bytes in oggparsevorbis instead of always
reimar
parents: 5032
diff changeset
135 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
136 if (n > 0)
2197
94d11eaef9bf whitespace cosmetics
mru
parents: 2196
diff changeset
137 av_log(as, AV_LOG_INFO,
94d11eaef9bf whitespace cosmetics
mru
parents: 2196
diff changeset
138 "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
139
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
140 return 0;
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
141 }
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
142
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
143
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
144 /** Parse the vorbis header
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
145 * 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
146 * [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
147 * [audio_channels] = read 8 bit integer as unsigned | Used
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 820
diff changeset
148 * [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
149 * [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
150 * [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
151 * [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
152 * [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
153 * [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
154 * [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
155 * */
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
156
4016
6cd006bc2de9 OGG: untypedef demuxer structs
mru
parents: 3770
diff changeset
157 struct oggvorbis_private {
760
c72bba158baa change extradata format for vorbis
mru
parents: 729
diff changeset
158 unsigned int len[3];
c72bba158baa change extradata format for vorbis
mru
parents: 729
diff changeset
159 unsigned char *packet[3];
4016
6cd006bc2de9 OGG: untypedef demuxer structs
mru
parents: 3770
diff changeset
160 };
760
c72bba158baa change extradata format for vorbis
mru
parents: 729
diff changeset
161
c72bba158baa change extradata format for vorbis
mru
parents: 729
diff changeset
162
c72bba158baa change extradata format for vorbis
mru
parents: 729
diff changeset
163 static unsigned int
4016
6cd006bc2de9 OGG: untypedef demuxer structs
mru
parents: 3770
diff changeset
164 fixup_vorbis_headers(AVFormatContext * as, struct oggvorbis_private *priv,
2198
7c13baaa4f87 warnings--
mru
parents: 2197
diff changeset
165 uint8_t **buf)
760
c72bba158baa change extradata format for vorbis
mru
parents: 729
diff changeset
166 {
c72bba158baa change extradata format for vorbis
mru
parents: 729
diff changeset
167 int i,offset, len;
c72bba158baa change extradata format for vorbis
mru
parents: 729
diff changeset
168 unsigned char *ptr;
c72bba158baa change extradata format for vorbis
mru
parents: 729
diff changeset
169
c72bba158baa change extradata format for vorbis
mru
parents: 729
diff changeset
170 len = priv->len[0] + priv->len[1] + priv->len[2];
c72bba158baa change extradata format for vorbis
mru
parents: 729
diff changeset
171 ptr = *buf = av_mallocz(len + len/255 + 64);
c72bba158baa change extradata format for vorbis
mru
parents: 729
diff changeset
172
c72bba158baa change extradata format for vorbis
mru
parents: 729
diff changeset
173 ptr[0] = 2;
c72bba158baa change extradata format for vorbis
mru
parents: 729
diff changeset
174 offset = 1;
c72bba158baa change extradata format for vorbis
mru
parents: 729
diff changeset
175 offset += av_xiphlacing(&ptr[offset], priv->len[0]);
c72bba158baa change extradata format for vorbis
mru
parents: 729
diff changeset
176 offset += av_xiphlacing(&ptr[offset], priv->len[1]);
2197
94d11eaef9bf whitespace cosmetics
mru
parents: 2196
diff changeset
177 for (i = 0; i < 3; i++) {
760
c72bba158baa change extradata format for vorbis
mru
parents: 729
diff changeset
178 memcpy(&ptr[offset], priv->packet[i], priv->len[i]);
c72bba158baa change extradata format for vorbis
mru
parents: 729
diff changeset
179 offset += priv->len[i];
5815
9e5e8c64ab54 oggdec: Fix memory leak in setting up vorbis headers
conrad
parents: 5814
diff changeset
180 av_freep(&priv->packet[i]);
760
c72bba158baa change extradata format for vorbis
mru
parents: 729
diff changeset
181 }
3584
c3c1b9302005 OGG: Add padding at end of Vorbis headers
mru
parents: 3286
diff changeset
182 *buf = av_realloc(*buf, offset + FF_INPUT_BUFFER_PADDING_SIZE);
760
c72bba158baa change extradata format for vorbis
mru
parents: 729
diff changeset
183 return offset;
c72bba158baa change extradata format for vorbis
mru
parents: 729
diff changeset
184 }
c72bba158baa change extradata format for vorbis
mru
parents: 729
diff changeset
185
c72bba158baa change extradata format for vorbis
mru
parents: 729
diff changeset
186
726
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
187 static int
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
188 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
189 {
4016
6cd006bc2de9 OGG: untypedef demuxer structs
mru
parents: 3770
diff changeset
190 struct ogg *ogg = s->priv_data;
6cd006bc2de9 OGG: untypedef demuxer structs
mru
parents: 3770
diff changeset
191 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
192 AVStream *st = s->streams[idx];
4016
6cd006bc2de9 OGG: untypedef demuxer structs
mru
parents: 3770
diff changeset
193 struct oggvorbis_private *priv;
5814
e993cab1faf3 oggdec: Don't use ogg_stream's seq for vorbis or speex headers
conrad
parents: 5618
diff changeset
194 int pkt_type = os->buf[os->pstart];
726
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
195
5814
e993cab1faf3 oggdec: Don't use ogg_stream's seq for vorbis or speex headers
conrad
parents: 5618
diff changeset
196 if (!(pkt_type & 1))
726
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
197 return 0;
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
198
5814
e993cab1faf3 oggdec: Don't use ogg_stream's seq for vorbis or speex headers
conrad
parents: 5618
diff changeset
199 if (!os->private) {
4016
6cd006bc2de9 OGG: untypedef demuxer structs
mru
parents: 3770
diff changeset
200 os->private = av_mallocz(sizeof(struct oggvorbis_private));
2197
94d11eaef9bf whitespace cosmetics
mru
parents: 2196
diff changeset
201 if (!os->private)
760
c72bba158baa change extradata format for vorbis
mru
parents: 729
diff changeset
202 return 0;
c72bba158baa change extradata format for vorbis
mru
parents: 729
diff changeset
203 }
726
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
204
5814
e993cab1faf3 oggdec: Don't use ogg_stream's seq for vorbis or speex headers
conrad
parents: 5618
diff changeset
205 if (os->psize < 1 || pkt_type > 5)
2595
f9cfd91f344a fix buffer overread with invalid Vorbis header
mru
parents: 2594
diff changeset
206 return -1;
f9cfd91f344a fix buffer overread with invalid Vorbis header
mru
parents: 2594
diff changeset
207
760
c72bba158baa change extradata format for vorbis
mru
parents: 729
diff changeset
208 priv = os->private;
5814
e993cab1faf3 oggdec: Don't use ogg_stream's seq for vorbis or speex headers
conrad
parents: 5618
diff changeset
209 priv->len[pkt_type >> 1] = os->psize;
e993cab1faf3 oggdec: Don't use ogg_stream's seq for vorbis or speex headers
conrad
parents: 5618
diff changeset
210 priv->packet[pkt_type >> 1] = av_mallocz(os->psize);
e993cab1faf3 oggdec: Don't use ogg_stream's seq for vorbis or speex headers
conrad
parents: 5618
diff changeset
211 memcpy(priv->packet[pkt_type >> 1], 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
212 if (os->buf[os->pstart] == 1) {
2996
bcoudurier
parents: 2714
diff changeset
213 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
214 unsigned blocksize, bs0, bs1;
2595
f9cfd91f344a fix buffer overread with invalid Vorbis header
mru
parents: 2594
diff changeset
215
f9cfd91f344a fix buffer overread with invalid Vorbis header
mru
parents: 2594
diff changeset
216 if (os->psize != 30)
f9cfd91f344a fix buffer overread with invalid Vorbis header
mru
parents: 2594
diff changeset
217 return -1;
f9cfd91f344a fix buffer overread with invalid Vorbis header
mru
parents: 2594
diff changeset
218
2597
eb7808a9d361 check values more thoroughly in vorbis_header()
mru
parents: 2596
diff changeset
219 if (bytestream_get_le32(&p) != 0) /* vorbis_version */
eb7808a9d361 check values more thoroughly in vorbis_header()
mru
parents: 2596
diff changeset
220 return -1;
eb7808a9d361 check values more thoroughly in vorbis_header()
mru
parents: 2596
diff changeset
221
2596
9e91148f1d44 use bytestream_get_* in vorbis_header()
mru
parents: 2595
diff changeset
222 st->codec->channels = bytestream_get_byte(&p);
9e91148f1d44 use bytestream_get_* in vorbis_header()
mru
parents: 2595
diff changeset
223 st->codec->sample_rate = bytestream_get_le32(&p);
9e91148f1d44 use bytestream_get_* in vorbis_header()
mru
parents: 2595
diff changeset
224 p += 4; // skip maximum bitrate
9e91148f1d44 use bytestream_get_* in vorbis_header()
mru
parents: 2595
diff changeset
225 st->codec->bit_rate = bytestream_get_le32(&p); // nominal bitrate
2597
eb7808a9d361 check values more thoroughly in vorbis_header()
mru
parents: 2596
diff changeset
226 p += 4; // skip minimum bitrate
eb7808a9d361 check values more thoroughly in vorbis_header()
mru
parents: 2596
diff changeset
227
eb7808a9d361 check values more thoroughly in vorbis_header()
mru
parents: 2596
diff changeset
228 blocksize = bytestream_get_byte(&p);
eb7808a9d361 check values more thoroughly in vorbis_header()
mru
parents: 2596
diff changeset
229 bs0 = blocksize & 15;
eb7808a9d361 check values more thoroughly in vorbis_header()
mru
parents: 2596
diff changeset
230 bs1 = blocksize >> 4;
eb7808a9d361 check values more thoroughly in vorbis_header()
mru
parents: 2596
diff changeset
231
eb7808a9d361 check values more thoroughly in vorbis_header()
mru
parents: 2596
diff changeset
232 if (bs0 > bs1)
eb7808a9d361 check values more thoroughly in vorbis_header()
mru
parents: 2596
diff changeset
233 return -1;
eb7808a9d361 check values more thoroughly in vorbis_header()
mru
parents: 2596
diff changeset
234 if (bs0 < 6 || bs1 > 13)
eb7808a9d361 check values more thoroughly in vorbis_header()
mru
parents: 2596
diff changeset
235 return -1;
eb7808a9d361 check values more thoroughly in vorbis_header()
mru
parents: 2596
diff changeset
236
eb7808a9d361 check values more thoroughly in vorbis_header()
mru
parents: 2596
diff changeset
237 if (bytestream_get_byte(&p) != 1) /* framing_flag */
eb7808a9d361 check values more thoroughly in vorbis_header()
mru
parents: 2596
diff changeset
238 return -1;
726
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
239
5910
536e5527c1e0 Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents: 5857
diff changeset
240 st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 760
diff changeset
241 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
242
1077
91677ac6fb19 set stream time_base properly
mru
parents: 885
diff changeset
243 st->time_base.num = 1;
91677ac6fb19 set stream time_base properly
mru
parents: 885
diff changeset
244 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
245 } else if (os->buf[os->pstart] == 3) {
2595
f9cfd91f344a fix buffer overread with invalid Vorbis header
mru
parents: 2594
diff changeset
246 if (os->psize > 8)
5824
b9f21d75c81a oggdec: Metadata is per-stream; don't merge multiple streams' together
conrad
parents: 5823
diff changeset
247 ff_vorbis_comment (s, &st->metadata, os->buf + os->pstart + 7, os->psize - 8);
760
c72bba158baa change extradata format for vorbis
mru
parents: 729
diff changeset
248 } 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
249 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
250 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
251 }
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
252
5814
e993cab1faf3 oggdec: Don't use ogg_stream's seq for vorbis or speex headers
conrad
parents: 5618
diff changeset
253 return 1;
726
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
254 }
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
255
4016
6cd006bc2de9 OGG: untypedef demuxer structs
mru
parents: 3770
diff changeset
256 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
257 .magic = "\001vorbis",
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
258 .magicsize = 7,
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
259 .header = vorbis_header
17178af951b4 Ogg demuxer ported from tcvp by Luca Barbato <lu_zero at gentoo dot org>,
mru
parents:
diff changeset
260 };