Mercurial > libavformat.hg
annotate oggparseogm.c @ 5786:7d670040187e libavformat
In mpegts muxer, search for h264 aud nal, it might not be the first nal.
Improve ther error message when bitstream is malformated and tell user to use
the bitstream filter.
author | bcoudurier |
---|---|
date | Mon, 08 Mar 2010 23:59:05 +0000 |
parents | 68c8e7affd44 |
children | d75025af2e7b |
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; | |
46 if(*p != 1) | |
47 return 1; | |
48 | |
49 p++; | |
50 | |
51 if(*p == 'v'){ | |
1077 | 52 int tag; |
1076 | 53 st->codec->codec_type = CODEC_TYPE_VIDEO; |
54 p += 8; | |
2226 | 55 tag = bytestream_get_le32(&p); |
5058
33a244b7ca65
Add ff_ prefixes to exported symbols in libavformat/riff.h.
diego
parents:
4872
diff
changeset
|
56 st->codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags, tag); |
1077 | 57 st->codec->codec_tag = tag; |
2994 | 58 } else if (*p == 't') { |
59 st->codec->codec_type = CODEC_TYPE_SUBTITLE; | |
60 st->codec->codec_id = CODEC_ID_TEXT; | |
61 p += 12; | |
1076 | 62 } else { |
2226 | 63 uint8_t acid[5]; |
1076 | 64 int cid; |
65 st->codec->codec_type = CODEC_TYPE_AUDIO; | |
66 p += 8; | |
2226 | 67 bytestream_get_buffer(&p, acid, 4); |
68 acid[4] = 0; | |
69 cid = strtol(acid, NULL, 16); | |
5058
33a244b7ca65
Add ff_ prefixes to exported symbols in libavformat/riff.h.
diego
parents:
4872
diff
changeset
|
70 st->codec->codec_id = ff_codec_get_id(ff_codec_wav_tags, cid); |
3346 | 71 st->need_parsing = AVSTREAM_PARSE_FULL; |
1076 | 72 } |
73 | |
74 p += 4; /* useless size field */ | |
75 | |
2226 | 76 time_unit = bytestream_get_le64(&p); |
77 spu = bytestream_get_le64(&p); | |
78 default_len = bytestream_get_le32(&p); | |
1076 | 79 |
80 p += 8; /* buffersize + bits_per_sample */ | |
81 | |
82 if(st->codec->codec_type == CODEC_TYPE_VIDEO){ | |
2226 | 83 st->codec->width = bytestream_get_le32(&p); |
84 st->codec->height = bytestream_get_le32(&p); | |
1076 | 85 st->codec->time_base.den = spu * 10000000; |
86 st->codec->time_base.num = time_unit; | |
87 st->time_base = st->codec->time_base; | |
88 } else { | |
2226 | 89 st->codec->channels = bytestream_get_le16(&p); |
1076 | 90 p += 2; /* block_align */ |
2226 | 91 st->codec->bit_rate = bytestream_get_le32(&p) * 8; |
1076 | 92 st->codec->sample_rate = spu * 10000000 / time_unit; |
1077 | 93 st->time_base.num = 1; |
94 st->time_base.den = st->codec->sample_rate; | |
1076 | 95 } |
96 | |
97 return 1; | |
98 } | |
99 | |
100 static int | |
101 ogm_dshow_header(AVFormatContext *s, int idx) | |
102 { | |
4016 | 103 struct ogg *ogg = s->priv_data; |
104 struct ogg_stream *os = ogg->streams + idx; | |
1076 | 105 AVStream *st = s->streams[idx]; |
106 uint8_t *p = os->buf + os->pstart; | |
107 uint32_t t; | |
108 | |
109 if(!(*p & 1)) | |
110 return 0; | |
111 if(*p != 1) | |
112 return 1; | |
113 | |
2226 | 114 t = AV_RL32(p + 96); |
1076 | 115 |
116 if(t == 0x05589f80){ | |
117 st->codec->codec_type = CODEC_TYPE_VIDEO; | |
5058
33a244b7ca65
Add ff_ prefixes to exported symbols in libavformat/riff.h.
diego
parents:
4872
diff
changeset
|
118 st->codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags, AV_RL32(p + 68)); |
1076 | 119 st->codec->time_base.den = 10000000; |
2226 | 120 st->codec->time_base.num = AV_RL64(p + 164); |
121 st->codec->width = AV_RL32(p + 176); | |
122 st->codec->height = AV_RL32(p + 180); | |
1076 | 123 } else if(t == 0x05589f81){ |
124 st->codec->codec_type = CODEC_TYPE_AUDIO; | |
5058
33a244b7ca65
Add ff_ prefixes to exported symbols in libavformat/riff.h.
diego
parents:
4872
diff
changeset
|
125 st->codec->codec_id = ff_codec_get_id(ff_codec_wav_tags, AV_RL16(p + 124)); |
2226 | 126 st->codec->channels = AV_RL16(p + 126); |
127 st->codec->sample_rate = AV_RL32(p + 128); | |
128 st->codec->bit_rate = AV_RL32(p + 132) * 8; | |
1076 | 129 } |
130 | |
131 return 1; | |
132 } | |
133 | |
134 static int | |
135 ogm_packet(AVFormatContext *s, int idx) | |
136 { | |
4016 | 137 struct ogg *ogg = s->priv_data; |
138 struct ogg_stream *os = ogg->streams + idx; | |
1076 | 139 uint8_t *p = os->buf + os->pstart; |
140 int lb; | |
141 | |
2732 | 142 if(*p & 8) |
143 os->pflags |= PKT_FLAG_KEY; | |
144 | |
1076 | 145 lb = ((*p & 2) << 1) | ((*p >> 6) & 3); |
146 os->pstart += lb + 1; | |
147 os->psize -= lb + 1; | |
148 | |
149 return 0; | |
150 } | |
151 | |
4016 | 152 const struct ogg_codec ff_ogm_video_codec = { |
1076 | 153 .magic = "\001video", |
154 .magicsize = 6, | |
155 .header = ogm_header, | |
5434 | 156 .packet = ogm_packet, |
157 .granule_is_start = 1, | |
1076 | 158 }; |
159 | |
4016 | 160 const struct ogg_codec ff_ogm_audio_codec = { |
1076 | 161 .magic = "\001audio", |
162 .magicsize = 6, | |
163 .header = ogm_header, | |
5434 | 164 .packet = ogm_packet, |
165 .granule_is_start = 1, | |
1076 | 166 }; |
167 | |
4016 | 168 const struct ogg_codec ff_ogm_text_codec = { |
2994 | 169 .magic = "\001text", |
170 .magicsize = 5, | |
171 .header = ogm_header, | |
5434 | 172 .packet = ogm_packet, |
173 .granule_is_start = 1, | |
2994 | 174 }; |
175 | |
4016 | 176 const struct ogg_codec ff_ogm_old_codec = { |
1076 | 177 .magic = "\001Direct Show Samples embedded in Ogg", |
178 .magicsize = 35, | |
179 .header = ogm_dshow_header, | |
5434 | 180 .packet = ogm_packet, |
181 .granule_is_start = 1, | |
1076 | 182 }; |