Mercurial > libavformat.hg
annotate oggparseogm.c @ 6044:33e5c3910738 libavformat
Fix detection of some stereo atrac files by not comparing the
block size mode and info byte. Reduced the probe score just in case.
author | banan |
---|---|
date | Sun, 23 May 2010 21:56:54 +0000 |
parents | 11bb10c37225 |
children |
rev | line source |
---|---|
1076 | 1 /** |
2 Copyright (C) 2005 Michael Ahlberg, Måns Rullgård | |
3 | |
4 Permission is hereby granted, free of charge, to any person | |
5 obtaining a copy of this software and associated documentation | |
6 files (the "Software"), to deal in the Software without | |
7 restriction, including without limitation the rights to use, copy, | |
8 modify, merge, publish, distribute, sublicense, and/or sell copies | |
9 of the Software, and to permit persons to whom the Software is | |
10 furnished to do so, subject to the following conditions: | |
11 | |
12 The above copyright notice and this permission notice shall be | |
13 included in all copies or substantial portions of the Software. | |
14 | |
15 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | |
16 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | |
17 MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | |
18 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT | |
19 HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, | |
20 WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | |
21 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | |
22 DEALINGS IN THE SOFTWARE. | |
23 **/ | |
24 | |
25 #include <stdlib.h> | |
3286 | 26 #include "libavutil/intreadwrite.h" |
4872 | 27 #include "libavcodec/get_bits.h" |
3286 | 28 #include "libavcodec/bytestream.h" |
1076 | 29 #include "avformat.h" |
2714 | 30 #include "oggdec.h" |
1172
6a5e58d2114b
move common stuff from avienc.c and wav.c to new file riff.c
mru
parents:
1077
diff
changeset
|
31 #include "riff.h" |
1076 | 32 |
33 static int | |
34 ogm_header(AVFormatContext *s, int idx) | |
35 { | |
4016 | 36 struct ogg *ogg = s->priv_data; |
37 struct ogg_stream *os = ogg->streams + idx; | |
1076 | 38 AVStream *st = s->streams[idx]; |
2997 | 39 const uint8_t *p = os->buf + os->pstart; |
1076 | 40 uint64_t time_unit; |
41 uint64_t spu; | |
42 uint32_t default_len; | |
43 | |
44 if(!(*p & 1)) | |
45 return 0; | |
5827 | 46 |
5826 | 47 if(*p == 1) { |
5827 | 48 p++; |
1076 | 49 |
5827 | 50 if(*p == 'v'){ |
51 int tag; | |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5833
diff
changeset
|
52 st->codec->codec_type = AVMEDIA_TYPE_VIDEO; |
5827 | 53 p += 8; |
54 tag = bytestream_get_le32(&p); | |
55 st->codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags, tag); | |
56 st->codec->codec_tag = tag; | |
57 } else if (*p == 't') { | |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5833
diff
changeset
|
58 st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE; |
5827 | 59 st->codec->codec_id = CODEC_ID_TEXT; |
60 p += 12; | |
61 } else { | |
62 uint8_t acid[5]; | |
63 int cid; | |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5833
diff
changeset
|
64 st->codec->codec_type = AVMEDIA_TYPE_AUDIO; |
5827 | 65 p += 8; |
66 bytestream_get_buffer(&p, acid, 4); | |
67 acid[4] = 0; | |
68 cid = strtol(acid, NULL, 16); | |
69 st->codec->codec_id = ff_codec_get_id(ff_codec_wav_tags, cid); | |
70 st->need_parsing = AVSTREAM_PARSE_FULL; | |
71 } | |
1076 | 72 |
5827 | 73 p += 4; /* useless size field */ |
1076 | 74 |
5827 | 75 time_unit = bytestream_get_le64(&p); |
76 spu = bytestream_get_le64(&p); | |
77 default_len = bytestream_get_le32(&p); | |
1076 | 78 |
5827 | 79 p += 8; /* buffersize + bits_per_sample */ |
1076 | 80 |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5833
diff
changeset
|
81 if(st->codec->codec_type == AVMEDIA_TYPE_VIDEO){ |
5827 | 82 st->codec->width = bytestream_get_le32(&p); |
83 st->codec->height = bytestream_get_le32(&p); | |
84 st->codec->time_base.den = spu * 10000000; | |
85 st->codec->time_base.num = time_unit; | |
86 st->time_base = st->codec->time_base; | |
87 } else { | |
88 st->codec->channels = bytestream_get_le16(&p); | |
89 p += 2; /* block_align */ | |
90 st->codec->bit_rate = bytestream_get_le32(&p) * 8; | |
91 st->codec->sample_rate = spu * 10000000 / time_unit; | |
92 st->time_base.num = 1; | |
93 st->time_base.den = st->codec->sample_rate; | |
94 } | |
5826 | 95 } else if (*p == 3) { |
96 if (os->psize > 8) | |
97 ff_vorbis_comment(s, &st->metadata, p+7, os->psize-8); | |
98 } | |
1076 | 99 |
100 return 1; | |
101 } | |
102 | |
103 static int | |
104 ogm_dshow_header(AVFormatContext *s, int idx) | |
105 { | |
4016 | 106 struct ogg *ogg = s->priv_data; |
107 struct ogg_stream *os = ogg->streams + idx; | |
1076 | 108 AVStream *st = s->streams[idx]; |
109 uint8_t *p = os->buf + os->pstart; | |
110 uint32_t t; | |
111 | |
112 if(!(*p & 1)) | |
113 return 0; | |
114 if(*p != 1) | |
115 return 1; | |
116 | |
2226 | 117 t = AV_RL32(p + 96); |
1076 | 118 |
119 if(t == 0x05589f80){ | |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5833
diff
changeset
|
120 st->codec->codec_type = AVMEDIA_TYPE_VIDEO; |
5058
33a244b7ca65
Add ff_ prefixes to exported symbols in libavformat/riff.h.
diego
parents:
4872
diff
changeset
|
121 st->codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags, AV_RL32(p + 68)); |
1076 | 122 st->codec->time_base.den = 10000000; |
2226 | 123 st->codec->time_base.num = AV_RL64(p + 164); |
124 st->codec->width = AV_RL32(p + 176); | |
125 st->codec->height = AV_RL32(p + 180); | |
1076 | 126 } else if(t == 0x05589f81){ |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5833
diff
changeset
|
127 st->codec->codec_type = AVMEDIA_TYPE_AUDIO; |
5058
33a244b7ca65
Add ff_ prefixes to exported symbols in libavformat/riff.h.
diego
parents:
4872
diff
changeset
|
128 st->codec->codec_id = ff_codec_get_id(ff_codec_wav_tags, AV_RL16(p + 124)); |
2226 | 129 st->codec->channels = AV_RL16(p + 126); |
130 st->codec->sample_rate = AV_RL32(p + 128); | |
131 st->codec->bit_rate = AV_RL32(p + 132) * 8; | |
1076 | 132 } |
133 | |
134 return 1; | |
135 } | |
136 | |
137 static int | |
138 ogm_packet(AVFormatContext *s, int idx) | |
139 { | |
4016 | 140 struct ogg *ogg = s->priv_data; |
141 struct ogg_stream *os = ogg->streams + idx; | |
1076 | 142 uint8_t *p = os->buf + os->pstart; |
143 int lb; | |
144 | |
2732 | 145 if(*p & 8) |
5913
11bb10c37225
Replace all occurences of PKT_FLAG_KEY with AV_PKT_FLAG_KEY.
cehoyos
parents:
5910
diff
changeset
|
146 os->pflags |= AV_PKT_FLAG_KEY; |
2732 | 147 |
1076 | 148 lb = ((*p & 2) << 1) | ((*p >> 6) & 3); |
149 os->pstart += lb + 1; | |
150 os->psize -= lb + 1; | |
151 | |
5833 | 152 while (lb--) |
153 os->pduration += p[lb+1] << (lb*8); | |
154 | |
1076 | 155 return 0; |
156 } | |
157 | |
4016 | 158 const struct ogg_codec ff_ogm_video_codec = { |
1076 | 159 .magic = "\001video", |
160 .magicsize = 6, | |
161 .header = ogm_header, | |
5434 | 162 .packet = ogm_packet, |
163 .granule_is_start = 1, | |
1076 | 164 }; |
165 | |
4016 | 166 const struct ogg_codec ff_ogm_audio_codec = { |
1076 | 167 .magic = "\001audio", |
168 .magicsize = 6, | |
169 .header = ogm_header, | |
5434 | 170 .packet = ogm_packet, |
171 .granule_is_start = 1, | |
1076 | 172 }; |
173 | |
4016 | 174 const struct ogg_codec ff_ogm_text_codec = { |
2994 | 175 .magic = "\001text", |
176 .magicsize = 5, | |
177 .header = ogm_header, | |
5434 | 178 .packet = ogm_packet, |
179 .granule_is_start = 1, | |
2994 | 180 }; |
181 | |
4016 | 182 const struct ogg_codec ff_ogm_old_codec = { |
1076 | 183 .magic = "\001Direct Show Samples embedded in Ogg", |
184 .magicsize = 35, | |
185 .header = ogm_dshow_header, | |
5434 | 186 .packet = ogm_packet, |
187 .granule_is_start = 1, | |
1076 | 188 }; |