annotate flvdec.c @ 4863:0793a33d775f libavformat

Disable metadata reading. Yes, I would like to know what this code is good for and this is the easiest way to. It would be a lot of messy code we can drop if it is useless. As a sideeffect this fixes issue977.
author michael
date Sun, 12 Apr 2009 04:01:03 +0000
parents ef366aa6b7f2
children acb51f192e13
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
1 /*
1415
3b00fb8ef8e4 replace coder/decoder file description in libavformat by muxer/demuxer
aurel
parents: 1414
diff changeset
2 * FLV demuxer
4251
77e0c7511d41 cosmetics: Remove pointless period after copyright statement non-sentences.
diego
parents: 4125
diff changeset
3 * Copyright (c) 2003 The FFmpeg Project
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
4 *
2216
1c30ea3c0fcf Group all copyright and author notices together.
diego
parents: 2023
diff changeset
5 * This demuxer will generate a 1 byte extradata for VP6F content.
1c30ea3c0fcf Group all copyright and author notices together.
diego
parents: 2023
diff changeset
6 * It is composed of:
1c30ea3c0fcf Group all copyright and author notices together.
diego
parents: 2023
diff changeset
7 * - upper 4bits: difference between encoded width and visible width
1c30ea3c0fcf Group all copyright and author notices together.
diego
parents: 2023
diff changeset
8 * - lower 4bits: difference between encoded height and visible height
1c30ea3c0fcf Group all copyright and author notices together.
diego
parents: 2023
diff changeset
9 *
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1318
diff changeset
10 * This file is part of FFmpeg.
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1318
diff changeset
11 *
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1318
diff changeset
12 * FFmpeg is free software; you can redistribute it and/or
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
13 * modify it under the terms of the GNU Lesser General Public
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
14 * License as published by the Free Software Foundation; either
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1318
diff changeset
15 * version 2.1 of the License, or (at your option) any later version.
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
16 *
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1318
diff changeset
17 * FFmpeg is distributed in the hope that it will be useful,
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
18 * but WITHOUT ANY WARRANTY; without even the implied warranty of
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
19 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
20 * Lesser General Public License for more details.
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
21 *
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
22 * You should have received a copy of the GNU Lesser General Public
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1318
diff changeset
23 * License along with FFmpeg; if not, write to the Free Software
896
edbe5c3717f9 Update licensing information: The FSF changed postal address.
diego
parents: 887
diff changeset
24 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
25 */
4559
ee5d7f52e4bc parse aac extradata to fetch channels and sample rate, patch from Netgem
bcoudurier
parents: 4542
diff changeset
26
ee5d7f52e4bc parse aac extradata to fetch channels and sample rate, patch from Netgem
bcoudurier
parents: 4542
diff changeset
27 #include "libavcodec/mpeg4audio.h"
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
28 #include "avformat.h"
1553
504ceaa50e31 Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents: 1415
diff changeset
29 #include "flv.h"
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
30
4034
608286f429a5 set pts in flv demuxer
bcoudurier
parents: 4013
diff changeset
31 typedef struct {
608286f429a5 set pts in flv demuxer
bcoudurier
parents: 4013
diff changeset
32 int wrong_dts; ///< wrong dts due to negative cts
608286f429a5 set pts in flv demuxer
bcoudurier
parents: 4013
diff changeset
33 } FLVContext;
608286f429a5 set pts in flv demuxer
bcoudurier
parents: 4013
diff changeset
34
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
35 static int flv_probe(AVProbeData *p)
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
36 {
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
37 const uint8_t *d;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
38
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
39 d = p->buf;
1718
3eb35e92a29a improve probe and give it the max score
michael
parents: 1568
diff changeset
40 if (d[0] == 'F' && d[1] == 'L' && d[2] == 'V' && d[3] < 5 && d[5]==0) {
3eb35e92a29a improve probe and give it the max score
michael
parents: 1568
diff changeset
41 return AVPROBE_SCORE_MAX;
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
42 }
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
43 return 0;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
44 }
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
45
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
46 static void flv_set_audio_codec(AVFormatContext *s, AVStream *astream, int flv_codecid) {
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
47 AVCodecContext *acodec = astream->codec;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
48 switch(flv_codecid) {
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
49 //no distinction between S16 and S8 PCM codec flags
3061
8ae0431d7f43 flv/swf do not have a big endian codec id, they only support
michael
parents: 2848
diff changeset
50 case FLV_CODECID_PCM:
3908
1d3d17de20ba Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents: 3799
diff changeset
51 acodec->codec_id = acodec->bits_per_coded_sample == 8 ? CODEC_ID_PCM_S8 :
3062
9a56dcf7edfb Fix issue357
michael
parents: 3061
diff changeset
52 #ifdef WORDS_BIGENDIAN
9a56dcf7edfb Fix issue357
michael
parents: 3061
diff changeset
53 CODEC_ID_PCM_S16BE;
9a56dcf7edfb Fix issue357
michael
parents: 3061
diff changeset
54 #else
9a56dcf7edfb Fix issue357
michael
parents: 3061
diff changeset
55 CODEC_ID_PCM_S16LE;
9a56dcf7edfb Fix issue357
michael
parents: 3061
diff changeset
56 #endif
9a56dcf7edfb Fix issue357
michael
parents: 3061
diff changeset
57 break;
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
58 case FLV_CODECID_PCM_LE:
3908
1d3d17de20ba Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents: 3799
diff changeset
59 acodec->codec_id = acodec->bits_per_coded_sample == 8 ? CODEC_ID_PCM_S8 : CODEC_ID_PCM_S16LE; break;
3364
73da68338e64 aac and h264 in flv demuxing
bcoudurier
parents: 3336
diff changeset
60 case FLV_CODECID_AAC : acodec->codec_id = CODEC_ID_AAC; break;
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
61 case FLV_CODECID_ADPCM: acodec->codec_id = CODEC_ID_ADPCM_SWF; break;
4006
cf359952a1fc force sample rate to 16khz for speex in flv, fix speexaudio.flv
bcoudurier
parents: 4005
diff changeset
62 case FLV_CODECID_SPEEX:
cf359952a1fc force sample rate to 16khz for speex in flv, fix speexaudio.flv
bcoudurier
parents: 4005
diff changeset
63 acodec->codec_id = CODEC_ID_SPEEX;
cf359952a1fc force sample rate to 16khz for speex in flv, fix speexaudio.flv
bcoudurier
parents: 4005
diff changeset
64 acodec->sample_rate = 16000;
cf359952a1fc force sample rate to 16khz for speex in flv, fix speexaudio.flv
bcoudurier
parents: 4005
diff changeset
65 break;
2023
a3e79d6e4e3c add an enum for need_parsing
aurel
parents: 2001
diff changeset
66 case FLV_CODECID_MP3 : acodec->codec_id = CODEC_ID_MP3 ; astream->need_parsing = AVSTREAM_PARSE_FULL; break;
3996
41f9a32e9516 8HZ -> 8KHZ, cosmetics patch by Alexander Wichers development at wichersdot nu
banan
parents: 3908
diff changeset
67 case FLV_CODECID_NELLYMOSER_8KHZ_MONO:
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
68 acodec->sample_rate = 8000; //in case metadata does not otherwise declare samplerate
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
69 case FLV_CODECID_NELLYMOSER:
2604
cb5f9ba6b63b Nellymoser ASAO decoder
banan
parents: 2572
diff changeset
70 acodec->codec_id = CODEC_ID_NELLYMOSER;
cb5f9ba6b63b Nellymoser ASAO decoder
banan
parents: 2572
diff changeset
71 break;
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
72 default:
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
73 av_log(s, AV_LOG_INFO, "Unsupported audio codec (%x)\n", flv_codecid >> FLV_AUDIO_CODECID_OFFSET);
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
74 acodec->codec_tag = flv_codecid >> FLV_AUDIO_CODECID_OFFSET;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
75 }
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
76 }
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
77
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
78 static int flv_set_video_codec(AVFormatContext *s, AVStream *vstream, int flv_codecid) {
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
79 AVCodecContext *vcodec = vstream->codec;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
80 switch(flv_codecid) {
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
81 case FLV_CODECID_H263 : vcodec->codec_id = CODEC_ID_FLV1 ; break;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
82 case FLV_CODECID_SCREEN: vcodec->codec_id = CODEC_ID_FLASHSV; break;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
83 case FLV_CODECID_VP6 : vcodec->codec_id = CODEC_ID_VP6F ;
2572
aabd822b5db5 use the VP6A codec
aurel
parents: 2571
diff changeset
84 case FLV_CODECID_VP6A :
aabd822b5db5 use the VP6A codec
aurel
parents: 2571
diff changeset
85 if(flv_codecid == FLV_CODECID_VP6A)
aabd822b5db5 use the VP6A codec
aurel
parents: 2571
diff changeset
86 vcodec->codec_id = CODEC_ID_VP6A;
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
87 if(vcodec->extradata_size != 1) {
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
88 vcodec->extradata_size = 1;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
89 vcodec->extradata = av_malloc(1);
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
90 }
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
91 vcodec->extradata[0] = get_byte(s->pb);
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
92 return 1; // 1 byte body size adjustment for flv_read_packet()
3364
73da68338e64 aac and h264 in flv demuxing
bcoudurier
parents: 3336
diff changeset
93 case FLV_CODECID_H264:
73da68338e64 aac and h264 in flv demuxing
bcoudurier
parents: 3336
diff changeset
94 vcodec->codec_id = CODEC_ID_H264;
73da68338e64 aac and h264 in flv demuxing
bcoudurier
parents: 3336
diff changeset
95 return 3; // not 4, reading packet type will consume one byte
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
96 default:
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
97 av_log(s, AV_LOG_INFO, "Unsupported video codec (%x)\n", flv_codecid);
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
98 vcodec->codec_tag = flv_codecid;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
99 }
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
100
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
101 return 0;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
102 }
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
103
1560
f59b66f9d679 amf_get_string() by Allan Hsu allan aat counterpop doot net
michael
parents: 1559
diff changeset
104 static int amf_get_string(ByteIOContext *ioc, char *buffer, int buffsize) {
1561
a21addc40d10 cosmetics
michael
parents: 1560
diff changeset
105 int length = get_be16(ioc);
1560
f59b66f9d679 amf_get_string() by Allan Hsu allan aat counterpop doot net
michael
parents: 1559
diff changeset
106 if(length >= buffsize) {
f59b66f9d679 amf_get_string() by Allan Hsu allan aat counterpop doot net
michael
parents: 1559
diff changeset
107 url_fskip(ioc, length);
1561
a21addc40d10 cosmetics
michael
parents: 1560
diff changeset
108 return -1;
1560
f59b66f9d679 amf_get_string() by Allan Hsu allan aat counterpop doot net
michael
parents: 1559
diff changeset
109 }
f59b66f9d679 amf_get_string() by Allan Hsu allan aat counterpop doot net
michael
parents: 1559
diff changeset
110
f59b66f9d679 amf_get_string() by Allan Hsu allan aat counterpop doot net
michael
parents: 1559
diff changeset
111 get_buffer(ioc, buffer, length);
f59b66f9d679 amf_get_string() by Allan Hsu allan aat counterpop doot net
michael
parents: 1559
diff changeset
112
f59b66f9d679 amf_get_string() by Allan Hsu allan aat counterpop doot net
michael
parents: 1559
diff changeset
113 buffer[length] = '\0';
f59b66f9d679 amf_get_string() by Allan Hsu allan aat counterpop doot net
michael
parents: 1559
diff changeset
114
f59b66f9d679 amf_get_string() by Allan Hsu allan aat counterpop doot net
michael
parents: 1559
diff changeset
115 return length;
f59b66f9d679 amf_get_string() by Allan Hsu allan aat counterpop doot net
michael
parents: 1559
diff changeset
116 }
f59b66f9d679 amf_get_string() by Allan Hsu allan aat counterpop doot net
michael
parents: 1559
diff changeset
117
4005
476a5d7182db fix for >2GB flv files
skal
parents: 3996
diff changeset
118 static int amf_parse_object(AVFormatContext *s, AVStream *astream, AVStream *vstream, const char *key, int64_t max_pos, int depth) {
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
119 AVCodecContext *acodec, *vcodec;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
120 ByteIOContext *ioc;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
121 AMFDataType amf_type;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
122 char str_val[256];
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
123 double num_val;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
124
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
125 num_val = 0;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
126 ioc = s->pb;
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
127
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
128 amf_type = get_byte(ioc);
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
129
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
130 switch(amf_type) {
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
131 case AMF_DATA_TYPE_NUMBER:
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
132 num_val = av_int2dbl(get_be64(ioc)); break;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
133 case AMF_DATA_TYPE_BOOL:
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
134 num_val = get_byte(ioc); break;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
135 case AMF_DATA_TYPE_STRING:
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
136 if(amf_get_string(ioc, str_val, sizeof(str_val)) < 0)
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
137 return -1;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
138 break;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
139 case AMF_DATA_TYPE_OBJECT: {
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
140 unsigned int keylen;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
141
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
142 while(url_ftell(ioc) < max_pos - 2 && (keylen = get_be16(ioc))) {
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
143 url_fskip(ioc, keylen); //skip key string
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
144 if(amf_parse_object(s, NULL, NULL, NULL, max_pos, depth + 1) < 0)
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
145 return -1; //if we couldn't skip, bomb out.
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
146 }
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
147 if(get_byte(ioc) != AMF_END_OF_OBJECT)
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
148 return -1;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
149 }
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
150 break;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
151 case AMF_DATA_TYPE_NULL:
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
152 case AMF_DATA_TYPE_UNDEFINED:
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
153 case AMF_DATA_TYPE_UNSUPPORTED:
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
154 break; //these take up no additional space
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
155 case AMF_DATA_TYPE_MIXEDARRAY:
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
156 url_fskip(ioc, 4); //skip 32-bit max array index
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
157 while(url_ftell(ioc) < max_pos - 2 && amf_get_string(ioc, str_val, sizeof(str_val)) > 0) {
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
158 //this is the only case in which we would want a nested parse to not skip over the object
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
159 if(amf_parse_object(s, astream, vstream, str_val, max_pos, depth + 1) < 0)
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
160 return -1;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
161 }
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
162 if(get_byte(ioc) != AMF_END_OF_OBJECT)
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
163 return -1;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
164 break;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
165 case AMF_DATA_TYPE_ARRAY: {
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
166 unsigned int arraylen, i;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
167
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
168 arraylen = get_be32(ioc);
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
169 for(i = 0; i < arraylen && url_ftell(ioc) < max_pos - 1; i++) {
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
170 if(amf_parse_object(s, NULL, NULL, NULL, max_pos, depth + 1) < 0)
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
171 return -1; //if we couldn't skip, bomb out.
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
172 }
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
173 }
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
174 break;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
175 case AMF_DATA_TYPE_DATE:
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
176 url_fskip(ioc, 8 + 2); //timestamp (double) and UTC offset (int16)
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
177 break;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
178 default: //unsupported type, we couldn't skip
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
179 return -1;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
180 }
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
181
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
182 if(depth == 1 && key) { //only look for metadata values when we are not nested and key != NULL
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
183 acodec = astream ? astream->codec : NULL;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
184 vcodec = vstream ? vstream->codec : NULL;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
185
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
186 if(amf_type == AMF_DATA_TYPE_BOOL) {
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
187 if(!strcmp(key, "stereo") && acodec) acodec->channels = num_val > 0 ? 2 : 1;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
188 } else if(amf_type == AMF_DATA_TYPE_NUMBER) {
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
189 if(!strcmp(key, "duration")) s->duration = num_val * AV_TIME_BASE;
1719
f813f8755dd1 flv follows in movs footsteps and has random trash in the width/height fields
michael
parents: 1718
diff changeset
190 // else if(!strcmp(key, "width") && vcodec && num_val > 0) vcodec->width = num_val;
f813f8755dd1 flv follows in movs footsteps and has random trash in the width/height fields
michael
parents: 1718
diff changeset
191 // else if(!strcmp(key, "height") && vcodec && num_val > 0) vcodec->height = num_val;
4347
932720e90fc5 Implement the reading of the video bitrate of flv movies out of the meta data,
benoit
parents: 4271
diff changeset
192 else if(!strcmp(key, "videodatarate") && vcodec && 0 <= (int)(num_val * 1024.0))
932720e90fc5 Implement the reading of the video bitrate of flv movies out of the meta data,
benoit
parents: 4271
diff changeset
193 vcodec->bit_rate = num_val * 1024.0;
3152
1d9a55c8d259 Additional checks for strange num_val in FLV metadata
skal
parents: 3062
diff changeset
194 else if(!strcmp(key, "audiocodecid") && acodec && 0 <= (int)num_val)
1d9a55c8d259 Additional checks for strange num_val in FLV metadata
skal
parents: 3062
diff changeset
195 flv_set_audio_codec(s, astream, (int)num_val << FLV_AUDIO_CODECID_OFFSET);
1d9a55c8d259 Additional checks for strange num_val in FLV metadata
skal
parents: 3062
diff changeset
196 else if(!strcmp(key, "videocodecid") && vcodec && 0 <= (int)num_val)
1d9a55c8d259 Additional checks for strange num_val in FLV metadata
skal
parents: 3062
diff changeset
197 flv_set_video_codec(s, vstream, (int)num_val);
1d9a55c8d259 Additional checks for strange num_val in FLV metadata
skal
parents: 3062
diff changeset
198 else if(!strcmp(key, "audiosamplesize") && acodec && 0 < (int)num_val) {
3908
1d3d17de20ba Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents: 3799
diff changeset
199 acodec->bits_per_coded_sample = num_val;
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
200 //we may have to rewrite a previously read codecid because FLV only marks PCM endianness.
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
201 if(num_val == 8 && (acodec->codec_id == CODEC_ID_PCM_S16BE || acodec->codec_id == CODEC_ID_PCM_S16LE))
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
202 acodec->codec_id = CODEC_ID_PCM_S8;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
203 }
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
204 else if(!strcmp(key, "audiosamplerate") && acodec && num_val >= 0) {
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
205 //some tools, like FLVTool2, write consistently approximate metadata sample rates
2847
f2a69a8c657d Correctly handle FLV_CODECID_NELLYMOSER_8HZ_MONO files
banan
parents: 2771
diff changeset
206 if (!acodec->sample_rate) {
2848
c8185d08d339 Reindent
banan
parents: 2847
diff changeset
207 switch((int)num_val) {
c8185d08d339 Reindent
banan
parents: 2847
diff changeset
208 case 44000: acodec->sample_rate = 44100 ; break;
c8185d08d339 Reindent
banan
parents: 2847
diff changeset
209 case 22000: acodec->sample_rate = 22050 ; break;
c8185d08d339 Reindent
banan
parents: 2847
diff changeset
210 case 11000: acodec->sample_rate = 11025 ; break;
c8185d08d339 Reindent
banan
parents: 2847
diff changeset
211 case 5000 : acodec->sample_rate = 5512 ; break;
c8185d08d339 Reindent
banan
parents: 2847
diff changeset
212 default : acodec->sample_rate = num_val;
c8185d08d339 Reindent
banan
parents: 2847
diff changeset
213 }
2847
f2a69a8c657d Correctly handle FLV_CODECID_NELLYMOSER_8HZ_MONO files
banan
parents: 2771
diff changeset
214 }
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
215 }
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
216 }
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
217 }
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
218
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
219 return 0;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
220 }
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
221
4005
476a5d7182db fix for >2GB flv files
skal
parents: 3996
diff changeset
222 static int flv_read_metabody(AVFormatContext *s, int64_t next_pos) {
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
223 AMFDataType type;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
224 AVStream *stream, *astream, *vstream;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
225 ByteIOContext *ioc;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
226 int i, keylen;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
227 char buffer[11]; //only needs to hold the string "onMetaData". Anything longer is something we don't want.
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
228
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
229 astream = NULL;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
230 vstream = NULL;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
231 keylen = 0;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
232 ioc = s->pb;
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
233
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
234 //first object needs to be "onMetaData" string
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
235 type = get_byte(ioc);
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
236 if(type != AMF_DATA_TYPE_STRING || amf_get_string(ioc, buffer, sizeof(buffer)) < 0 || strcmp(buffer, "onMetaData"))
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
237 return -1;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
238
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
239 //find the streams now so that amf_parse_object doesn't need to do the lookup every time it is called.
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
240 for(i = 0; i < s->nb_streams; i++) {
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
241 stream = s->streams[i];
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
242 if (stream->codec->codec_type == CODEC_TYPE_AUDIO) astream = stream;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
243 else if(stream->codec->codec_type == CODEC_TYPE_VIDEO) vstream = stream;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
244 }
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
245
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
246 //parse the second object (we want a mixed array)
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
247 if(amf_parse_object(s, astream, vstream, buffer, next_pos, 0) < 0)
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
248 return -1;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
249
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
250 return 0;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
251 }
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
252
2691
002ab6bbf9db factorize stream creation
michael
parents: 2604
diff changeset
253 static AVStream *create_stream(AVFormatContext *s, int is_audio){
002ab6bbf9db factorize stream creation
michael
parents: 2604
diff changeset
254 AVStream *st = av_new_stream(s, is_audio);
002ab6bbf9db factorize stream creation
michael
parents: 2604
diff changeset
255 if (!st)
002ab6bbf9db factorize stream creation
michael
parents: 2604
diff changeset
256 return NULL;
002ab6bbf9db factorize stream creation
michael
parents: 2604
diff changeset
257 st->codec->codec_type = is_audio ? CODEC_TYPE_AUDIO : CODEC_TYPE_VIDEO;
3335
efed46e8afb3 flv use 32 bit pts
bcoudurier
parents: 3251
diff changeset
258 av_set_pts_info(st, 32, 1, 1000); /* 32 bit pts in ms */
2691
002ab6bbf9db factorize stream creation
michael
parents: 2604
diff changeset
259 return st;
002ab6bbf9db factorize stream creation
michael
parents: 2604
diff changeset
260 }
002ab6bbf9db factorize stream creation
michael
parents: 2604
diff changeset
261
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
262 static int flv_read_header(AVFormatContext *s,
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
263 AVFormatParameters *ap)
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
264 {
1563
bf3589ba8d7e move duration finding code into read_packet() so it can be skiped if duration has already been set
michael
parents: 1562
diff changeset
265 int offset, flags;
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
266
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
267 url_fskip(s->pb, 4);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
268 flags = get_byte(s->pb);
1886
cf8db4fe9efa workaround for broken flvtoolized files
alex
parents: 1719
diff changeset
269 /* old flvtool cleared this field */
cf8db4fe9efa workaround for broken flvtoolized files
alex
parents: 1719
diff changeset
270 /* FIXME: better fix needed */
cf8db4fe9efa workaround for broken flvtoolized files
alex
parents: 1719
diff changeset
271 if (!flags) {
cf8db4fe9efa workaround for broken flvtoolized files
alex
parents: 1719
diff changeset
272 flags = FLV_HEADER_FLAG_HASVIDEO | FLV_HEADER_FLAG_HASAUDIO;
cf8db4fe9efa workaround for broken flvtoolized files
alex
parents: 1719
diff changeset
273 av_log(s, AV_LOG_WARNING, "Broken FLV file, which says no streams present, this might fail\n");
cf8db4fe9efa workaround for broken flvtoolized files
alex
parents: 1719
diff changeset
274 }
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
275
3218
d5b42f345638 Recommit r12809
michael
parents: 3217
diff changeset
276 if((flags & (FLV_HEADER_FLAG_HASVIDEO|FLV_HEADER_FLAG_HASAUDIO))
d5b42f345638 Recommit r12809
michael
parents: 3217
diff changeset
277 != (FLV_HEADER_FLAG_HASVIDEO|FLV_HEADER_FLAG_HASAUDIO))
d5b42f345638 Recommit r12809
michael
parents: 3217
diff changeset
278 s->ctx_flags |= AVFMTCTX_NOHEADER;
d5b42f345638 Recommit r12809
michael
parents: 3217
diff changeset
279
1559
515e80ef01e6 get rid of AVFMTCTX_NOHEADER, create streams in read_header()
michael
parents: 1553
diff changeset
280 if(flags & FLV_HEADER_FLAG_HASVIDEO){
2691
002ab6bbf9db factorize stream creation
michael
parents: 2604
diff changeset
281 if(!create_stream(s, 0))
2273
7eb456c4ed8a Replace all occurrences of AVERROR_NOMEM with AVERROR(ENOMEM).
takis
parents: 2216
diff changeset
282 return AVERROR(ENOMEM);
1559
515e80ef01e6 get rid of AVFMTCTX_NOHEADER, create streams in read_header()
michael
parents: 1553
diff changeset
283 }
515e80ef01e6 get rid of AVFMTCTX_NOHEADER, create streams in read_header()
michael
parents: 1553
diff changeset
284 if(flags & FLV_HEADER_FLAG_HASAUDIO){
2691
002ab6bbf9db factorize stream creation
michael
parents: 2604
diff changeset
285 if(!create_stream(s, 1))
2273
7eb456c4ed8a Replace all occurrences of AVERROR_NOMEM with AVERROR(ENOMEM).
takis
parents: 2216
diff changeset
286 return AVERROR(ENOMEM);
1559
515e80ef01e6 get rid of AVFMTCTX_NOHEADER, create streams in read_header()
michael
parents: 1553
diff changeset
287 }
515e80ef01e6 get rid of AVFMTCTX_NOHEADER, create streams in read_header()
michael
parents: 1553
diff changeset
288
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
289 offset = get_be32(s->pb);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
290 url_fseek(s->pb, offset, SEEK_SET);
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
291
1318
defa841523a9 FLV seeking patch by Nazo. lovesyao at aol com.
banan
parents: 1305
diff changeset
292 s->start_time = 0;
defa841523a9 FLV seeking patch by Nazo. lovesyao at aol com.
banan
parents: 1305
diff changeset
293
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
294 return 0;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
295 }
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
296
3364
73da68338e64 aac and h264 in flv demuxing
bcoudurier
parents: 3336
diff changeset
297 static int flv_get_extradata(AVFormatContext *s, AVStream *st, int size)
73da68338e64 aac and h264 in flv demuxing
bcoudurier
parents: 3336
diff changeset
298 {
73da68338e64 aac and h264 in flv demuxing
bcoudurier
parents: 3336
diff changeset
299 av_free(st->codec->extradata);
73da68338e64 aac and h264 in flv demuxing
bcoudurier
parents: 3336
diff changeset
300 st->codec->extradata = av_mallocz(size + FF_INPUT_BUFFER_PADDING_SIZE);
73da68338e64 aac and h264 in flv demuxing
bcoudurier
parents: 3336
diff changeset
301 if (!st->codec->extradata)
73da68338e64 aac and h264 in flv demuxing
bcoudurier
parents: 3336
diff changeset
302 return AVERROR(ENOMEM);
73da68338e64 aac and h264 in flv demuxing
bcoudurier
parents: 3336
diff changeset
303 st->codec->extradata_size = size;
73da68338e64 aac and h264 in flv demuxing
bcoudurier
parents: 3336
diff changeset
304 get_buffer(s->pb, st->codec->extradata, st->codec->extradata_size);
73da68338e64 aac and h264 in flv demuxing
bcoudurier
parents: 3336
diff changeset
305 return 0;
73da68338e64 aac and h264 in flv demuxing
bcoudurier
parents: 3336
diff changeset
306 }
73da68338e64 aac and h264 in flv demuxing
bcoudurier
parents: 3336
diff changeset
307
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
308 static int flv_read_packet(AVFormatContext *s, AVPacket *pkt)
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
309 {
4034
608286f429a5 set pts in flv demuxer
bcoudurier
parents: 4013
diff changeset
310 FLVContext *flv = s->priv_data;
4005
476a5d7182db fix for >2GB flv files
skal
parents: 3996
diff changeset
311 int ret, i, type, size, flags, is_audio;
476a5d7182db fix for >2GB flv files
skal
parents: 3996
diff changeset
312 int64_t next, pos;
4034
608286f429a5 set pts in flv demuxer
bcoudurier
parents: 4013
diff changeset
313 int64_t dts, pts = AV_NOPTS_VALUE;
679
54d87ed9b3e4 correct pcm in flv handling
alex
parents: 652
diff changeset
314 AVStream *st = NULL;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 822
diff changeset
315
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
316 for(;;){
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
317 pos = url_ftell(s->pb);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
318 url_fskip(s->pb, 4); /* size of previous packet */
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
319 type = get_byte(s->pb);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
320 size = get_be24(s->pb);
3336
664637a9867b in flv this field is dts finally
bcoudurier
parents: 3335
diff changeset
321 dts = get_be24(s->pb);
664637a9867b in flv this field is dts finally
bcoudurier
parents: 3335
diff changeset
322 dts |= get_byte(s->pb) << 24;
664637a9867b in flv this field is dts finally
bcoudurier
parents: 3335
diff changeset
323 // av_log(s, AV_LOG_DEBUG, "type:%d, size:%d, dts:%d\n", type, size, dts);
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
324 if (url_feof(s->pb))
4542
241a66d33f49 FLV demuxer: return AVERROR_EOF upon detection of end of file.
pross
parents: 4509
diff changeset
325 return AVERROR_EOF;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
326 url_fskip(s->pb, 3); /* stream id, always 0 */
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
327 flags = 0;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 822
diff changeset
328
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
329 if(size == 0)
c1f88671135b cleanup
michael
parents: 378
diff changeset
330 continue;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 822
diff changeset
331
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
332 next= size + url_ftell(s->pb);
821
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
333
1553
504ceaa50e31 Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents: 1415
diff changeset
334 if (type == FLV_TAG_TYPE_AUDIO) {
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
335 is_audio=1;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
336 flags = get_byte(s->pb);
3797
5fc16ca7b356 simplify size handling code
bcoudurier
parents: 3795
diff changeset
337 size--;
1553
504ceaa50e31 Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents: 1415
diff changeset
338 } else if (type == FLV_TAG_TYPE_VIDEO) {
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
339 is_audio=0;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
340 flags = get_byte(s->pb);
3797
5fc16ca7b356 simplify size handling code
bcoudurier
parents: 3795
diff changeset
341 size--;
3798
181ce3b7ca8b factorize packet skip code
bcoudurier
parents: 3797
diff changeset
342 if ((flags & 0xf0) == 0x50) /* video info / command frame */
181ce3b7ca8b factorize packet skip code
bcoudurier
parents: 3797
diff changeset
343 goto skip;
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
344 } else {
4863
0793a33d775f Disable metadata reading. Yes, I would like to know what this code is good for
michael
parents: 4811
diff changeset
345 if (type == FLV_TAG_TYPE_META && size > 13+1+4 && 0)
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
346 flv_read_metabody(s, next);
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
347 else /* skip packet */
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
348 av_log(s, AV_LOG_ERROR, "skipping flv packet: type %d, size %d, flags %d\n", type, size, flags);
3798
181ce3b7ca8b factorize packet skip code
bcoudurier
parents: 3797
diff changeset
349 skip:
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
350 url_fseek(s->pb, next, SEEK_SET);
4643
d148dbaebaca Replace two 'return AVERROR(EAGAIN);' by continue. The latter are nicer
michael
parents: 4559
diff changeset
351 continue;
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
352 }
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
353
3799
2f2fbec96aeb skip empty flv data packets, fix issue #602
bcoudurier
parents: 3798
diff changeset
354 /* skip empty data packets */
2f2fbec96aeb skip empty flv data packets, fix issue #602
bcoudurier
parents: 3798
diff changeset
355 if (!size)
2f2fbec96aeb skip empty flv data packets, fix issue #602
bcoudurier
parents: 3798
diff changeset
356 continue;
2f2fbec96aeb skip empty flv data packets, fix issue #602
bcoudurier
parents: 3798
diff changeset
357
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
358 /* now find stream */
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
359 for(i=0;i<s->nb_streams;i++) {
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
360 st = s->streams[i];
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
361 if (st->id == is_audio)
c1f88671135b cleanup
michael
parents: 378
diff changeset
362 break;
c1f88671135b cleanup
michael
parents: 378
diff changeset
363 }
c1f88671135b cleanup
michael
parents: 378
diff changeset
364 if(i == s->nb_streams){
4509
8ec95cf6deb9 Add a context to av_log() calls.
benoit
parents: 4347
diff changeset
365 av_log(s, AV_LOG_ERROR, "invalid stream\n");
2692
d320b2990d7e support flv with invalid header
michael
parents: 2691
diff changeset
366 st= create_stream(s, is_audio);
3215
4efe0debe0cf Stop find_stream_info() searching for further streams if 2 streams have
michael
parents: 3214
diff changeset
367 s->ctx_flags &= ~AVFMTCTX_NOHEADER;
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
368 }
4509
8ec95cf6deb9 Add a context to av_log() calls.
benoit
parents: 4347
diff changeset
369 // av_log(s, AV_LOG_DEBUG, "%d %X %d \n", is_audio, flags, st->discard);
1553
504ceaa50e31 Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents: 1415
diff changeset
370 if( (st->discard >= AVDISCARD_NONKEY && !((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY || is_audio))
504ceaa50e31 Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents: 1415
diff changeset
371 ||(st->discard >= AVDISCARD_BIDIR && ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_DISP_INTER && !is_audio))
708
d79164865a7c more fine grained discarding of packets
michael
parents: 684
diff changeset
372 || st->discard >= AVDISCARD_ALL
d79164865a7c more fine grained discarding of packets
michael
parents: 684
diff changeset
373 ){
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
374 url_fseek(s->pb, next, SEEK_SET);
4643
d148dbaebaca Replace two 'return AVERROR(EAGAIN);' by continue. The latter are nicer
michael
parents: 4559
diff changeset
375 continue;
652
b47948262721 support discarding uninterresting packets
michael
parents: 620
diff changeset
376 }
1553
504ceaa50e31 Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents: 1415
diff changeset
377 if ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY)
3336
664637a9867b in flv this field is dts finally
bcoudurier
parents: 3335
diff changeset
378 av_add_index_entry(st, pos, dts, size, 0, AVINDEX_KEYFRAME);
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
379 break;
c1f88671135b cleanup
michael
parents: 378
diff changeset
380 }
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
381
1563
bf3589ba8d7e move duration finding code into read_packet() so it can be skiped if duration has already been set
michael
parents: 1562
diff changeset
382 // if not streamed and no duration from metadata then seek to end to find the duration from the timestamps
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
383 if(!url_is_streamed(s->pb) && s->duration==AV_NOPTS_VALUE){
1563
bf3589ba8d7e move duration finding code into read_packet() so it can be skiped if duration has already been set
michael
parents: 1562
diff changeset
384 int size;
4005
476a5d7182db fix for >2GB flv files
skal
parents: 3996
diff changeset
385 const int64_t pos= url_ftell(s->pb);
476a5d7182db fix for >2GB flv files
skal
parents: 3996
diff changeset
386 const int64_t fsize= url_fsize(s->pb);
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
387 url_fseek(s->pb, fsize-4, SEEK_SET);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
388 size= get_be32(s->pb);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
389 url_fseek(s->pb, fsize-3-size, SEEK_SET);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
390 if(size == get_be24(s->pb) + 11){
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
391 s->duration= get_be24(s->pb) * (int64_t)AV_TIME_BASE / 1000;
1563
bf3589ba8d7e move duration finding code into read_packet() so it can be skiped if duration has already been set
michael
parents: 1562
diff changeset
392 }
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
393 url_fseek(s->pb, pos, SEEK_SET);
1563
bf3589ba8d7e move duration finding code into read_packet() so it can be skiped if duration has already been set
michael
parents: 1562
diff changeset
394 }
bf3589ba8d7e move duration finding code into read_packet() so it can be skiped if duration has already been set
michael
parents: 1562
diff changeset
395
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
396 if(is_audio){
4125
df6989f6122b Fix detection of audio codec in K70707-ARIA229.flv.
michael
parents: 4034
diff changeset
397 if(!st->codec->channels || !st->codec->sample_rate || !st->codec->bits_per_coded_sample) {
1553
504ceaa50e31 Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents: 1415
diff changeset
398 st->codec->channels = (flags & FLV_AUDIO_CHANNEL_MASK) == FLV_STEREO ? 2 : 1;
4009
f492dad79579 simplify sample rate code, flv_set_audio_codec already overrides it for nellymoser 8khz
bcoudurier
parents: 4006
diff changeset
399 st->codec->sample_rate = (44100 << ((flags & FLV_AUDIO_SAMPLERATE_MASK) >> FLV_AUDIO_SAMPLERATE_OFFSET) >> 3);
3908
1d3d17de20ba Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents: 3799
diff changeset
400 st->codec->bits_per_coded_sample = (flags & FLV_AUDIO_SAMPLESIZE_MASK) ? 16 : 8;
4125
df6989f6122b Fix detection of audio codec in K70707-ARIA229.flv.
michael
parents: 4034
diff changeset
401 }
df6989f6122b Fix detection of audio codec in K70707-ARIA229.flv.
michael
parents: 4034
diff changeset
402 if(!st->codec->codec_id){
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
403 flv_set_audio_codec(s, st, flags & FLV_AUDIO_CODECID_MASK);
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
404 }
c1f88671135b cleanup
michael
parents: 378
diff changeset
405 }else{
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
406 size -= flv_set_video_codec(s, st, flags & FLV_VIDEO_CODECID_MASK);
378
abd83fc30f0e guess framerate
michael
parents: 376
diff changeset
407 }
abd83fc30f0e guess framerate
michael
parents: 376
diff changeset
408
3364
73da68338e64 aac and h264 in flv demuxing
bcoudurier
parents: 3336
diff changeset
409 if (st->codec->codec_id == CODEC_ID_AAC ||
73da68338e64 aac and h264 in flv demuxing
bcoudurier
parents: 3336
diff changeset
410 st->codec->codec_id == CODEC_ID_H264) {
73da68338e64 aac and h264 in flv demuxing
bcoudurier
parents: 3336
diff changeset
411 int type = get_byte(s->pb);
73da68338e64 aac and h264 in flv demuxing
bcoudurier
parents: 3336
diff changeset
412 size--;
73da68338e64 aac and h264 in flv demuxing
bcoudurier
parents: 3336
diff changeset
413 if (st->codec->codec_id == CODEC_ID_H264) {
4034
608286f429a5 set pts in flv demuxer
bcoudurier
parents: 4013
diff changeset
414 int32_t cts = (get_be24(s->pb)+0xff800000)^0xff800000; // sign extension
608286f429a5 set pts in flv demuxer
bcoudurier
parents: 4013
diff changeset
415 pts = dts + cts;
608286f429a5 set pts in flv demuxer
bcoudurier
parents: 4013
diff changeset
416 if (cts < 0) { // dts are wrong
608286f429a5 set pts in flv demuxer
bcoudurier
parents: 4013
diff changeset
417 flv->wrong_dts = 1;
608286f429a5 set pts in flv demuxer
bcoudurier
parents: 4013
diff changeset
418 av_log(s, AV_LOG_WARNING, "negative cts, previous timestamps might be wrong\n");
608286f429a5 set pts in flv demuxer
bcoudurier
parents: 4013
diff changeset
419 }
608286f429a5 set pts in flv demuxer
bcoudurier
parents: 4013
diff changeset
420 if (flv->wrong_dts)
608286f429a5 set pts in flv demuxer
bcoudurier
parents: 4013
diff changeset
421 dts = AV_NOPTS_VALUE;
3364
73da68338e64 aac and h264 in flv demuxing
bcoudurier
parents: 3336
diff changeset
422 }
73da68338e64 aac and h264 in flv demuxing
bcoudurier
parents: 3336
diff changeset
423 if (type == 0) {
3797
5fc16ca7b356 simplify size handling code
bcoudurier
parents: 3795
diff changeset
424 if ((ret = flv_get_extradata(s, st, size)) < 0)
3364
73da68338e64 aac and h264 in flv demuxing
bcoudurier
parents: 3336
diff changeset
425 return ret;
4559
ee5d7f52e4bc parse aac extradata to fetch channels and sample rate, patch from Netgem
bcoudurier
parents: 4542
diff changeset
426 if (st->codec->codec_id == CODEC_ID_AAC) {
ee5d7f52e4bc parse aac extradata to fetch channels and sample rate, patch from Netgem
bcoudurier
parents: 4542
diff changeset
427 MPEG4AudioConfig cfg;
ee5d7f52e4bc parse aac extradata to fetch channels and sample rate, patch from Netgem
bcoudurier
parents: 4542
diff changeset
428 ff_mpeg4audio_get_config(&cfg, st->codec->extradata,
ee5d7f52e4bc parse aac extradata to fetch channels and sample rate, patch from Netgem
bcoudurier
parents: 4542
diff changeset
429 st->codec->extradata_size);
ee5d7f52e4bc parse aac extradata to fetch channels and sample rate, patch from Netgem
bcoudurier
parents: 4542
diff changeset
430 if (cfg.chan_config > 7)
ee5d7f52e4bc parse aac extradata to fetch channels and sample rate, patch from Netgem
bcoudurier
parents: 4542
diff changeset
431 return -1;
ee5d7f52e4bc parse aac extradata to fetch channels and sample rate, patch from Netgem
bcoudurier
parents: 4542
diff changeset
432 st->codec->channels = ff_mpeg4audio_channels[cfg.chan_config];
ee5d7f52e4bc parse aac extradata to fetch channels and sample rate, patch from Netgem
bcoudurier
parents: 4542
diff changeset
433 st->codec->sample_rate = cfg.sample_rate;
ee5d7f52e4bc parse aac extradata to fetch channels and sample rate, patch from Netgem
bcoudurier
parents: 4542
diff changeset
434 dprintf(s, "mp4a config channels %d sample rate %d\n",
ee5d7f52e4bc parse aac extradata to fetch channels and sample rate, patch from Netgem
bcoudurier
parents: 4542
diff changeset
435 st->codec->channels, st->codec->sample_rate);
ee5d7f52e4bc parse aac extradata to fetch channels and sample rate, patch from Netgem
bcoudurier
parents: 4542
diff changeset
436 }
ee5d7f52e4bc parse aac extradata to fetch channels and sample rate, patch from Netgem
bcoudurier
parents: 4542
diff changeset
437
4271
f9ec55b30dfa Use EAGAIN return, primarely intended as example of EAGAIN useage.
michael
parents: 4251
diff changeset
438 return AVERROR(EAGAIN);
3364
73da68338e64 aac and h264 in flv demuxing
bcoudurier
parents: 3336
diff changeset
439 }
73da68338e64 aac and h264 in flv demuxing
bcoudurier
parents: 3336
diff changeset
440 }
73da68338e64 aac and h264 in flv demuxing
bcoudurier
parents: 3336
diff changeset
441
4805
063522a177cc skip empty data packets in flv, fix input.flv
bcoudurier
parents: 4643
diff changeset
442 /* skip empty data packets */
063522a177cc skip empty data packets in flv, fix input.flv
bcoudurier
parents: 4643
diff changeset
443 if (!size)
063522a177cc skip empty data packets in flv, fix input.flv
bcoudurier
parents: 4643
diff changeset
444 return AVERROR(EAGAIN);
063522a177cc skip empty data packets in flv, fix input.flv
bcoudurier
parents: 4643
diff changeset
445
3797
5fc16ca7b356 simplify size handling code
bcoudurier
parents: 3795
diff changeset
446 ret= av_get_packet(s->pb, pkt, size);
4811
ef366aa6b7f2 Do not fail on zero packets.
michael
parents: 4805
diff changeset
447 if (ret < 0) {
2274
b21c2af60bc9 Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents: 2273
diff changeset
448 return AVERROR(EIO);
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
449 }
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
450 /* note: we need to modify the packet size here to handle the last
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
451 packet */
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
452 pkt->size = ret;
3336
664637a9867b in flv this field is dts finally
bcoudurier
parents: 3335
diff changeset
453 pkt->dts = dts;
4034
608286f429a5 set pts in flv demuxer
bcoudurier
parents: 4013
diff changeset
454 pkt->pts = pts == AV_NOPTS_VALUE ? dts : pts;
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
455 pkt->stream_index = st->index;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 822
diff changeset
456
1553
504ceaa50e31 Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents: 1415
diff changeset
457 if (is_audio || ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY))
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
458 pkt->flags |= PKT_FLAG_KEY;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 822
diff changeset
459
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
460 return ret;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
461 }
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
462
1167
d89d7ef290da give AVInput/OutputFormat structs consistent names
mru
parents: 1101
diff changeset
463 AVInputFormat flv_demuxer = {
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
464 "flv",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3364
diff changeset
465 NULL_IF_CONFIG_SMALL("FLV format"),
4034
608286f429a5 set pts in flv demuxer
bcoudurier
parents: 4013
diff changeset
466 sizeof(FLVContext),
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
467 flv_probe,
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
468 flv_read_header,
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
469 flv_read_packet,
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
470 .extensions = "flv",
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
471 .value = CODEC_ID_FLV1,
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
472 };