Mercurial > libavformat.hg
annotate flvdec.c @ 4887:acb51f192e13 libavformat
Remove unused variable from flv_read_metabody() found by CSA.
| author | michael |
|---|---|
| date | Fri, 17 Apr 2009 17:42:41 +0000 |
| parents | 0793a33d775f |
| children | 3550a49d6255 |
| 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 | 5 * This demuxer will generate a 1 byte extradata for VP6F content. |
| 6 * It is composed of: | |
| 7 * - upper 4bits: difference between encoded width and visible width | |
| 8 * - lower 4bits: difference between encoded height and visible height | |
| 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 | 31 typedef struct { |
| 32 int wrong_dts; ///< wrong dts due to negative cts | |
| 33 } FLVContext; | |
| 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 | 40 if (d[0] == 'F' && d[1] == 'L' && d[2] == 'V' && d[3] < 5 && d[5]==0) { |
| 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 | 46 static void flv_set_audio_codec(AVFormatContext *s, AVStream *astream, int flv_codecid) { |
| 47 AVCodecContext *acodec = astream->codec; | |
| 48 switch(flv_codecid) { | |
| 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 | 52 #ifdef WORDS_BIGENDIAN |
| 53 CODEC_ID_PCM_S16BE; | |
| 54 #else | |
| 55 CODEC_ID_PCM_S16LE; | |
| 56 #endif | |
| 57 break; | |
| 1568 | 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 | 60 case FLV_CODECID_AAC : acodec->codec_id = CODEC_ID_AAC; break; |
| 1568 | 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 | 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 | 68 acodec->sample_rate = 8000; //in case metadata does not otherwise declare samplerate |
| 69 case FLV_CODECID_NELLYMOSER: | |
| 2604 | 70 acodec->codec_id = CODEC_ID_NELLYMOSER; |
| 71 break; | |
| 1568 | 72 default: |
| 73 av_log(s, AV_LOG_INFO, "Unsupported audio codec (%x)\n", flv_codecid >> FLV_AUDIO_CODECID_OFFSET); | |
| 74 acodec->codec_tag = flv_codecid >> FLV_AUDIO_CODECID_OFFSET; | |
| 75 } | |
| 76 } | |
| 77 | |
| 78 static int flv_set_video_codec(AVFormatContext *s, AVStream *vstream, int flv_codecid) { | |
| 79 AVCodecContext *vcodec = vstream->codec; | |
| 80 switch(flv_codecid) { | |
| 81 case FLV_CODECID_H263 : vcodec->codec_id = CODEC_ID_FLV1 ; break; | |
| 82 case FLV_CODECID_SCREEN: vcodec->codec_id = CODEC_ID_FLASHSV; break; | |
| 83 case FLV_CODECID_VP6 : vcodec->codec_id = CODEC_ID_VP6F ; | |
| 2572 | 84 case FLV_CODECID_VP6A : |
| 85 if(flv_codecid == FLV_CODECID_VP6A) | |
| 86 vcodec->codec_id = CODEC_ID_VP6A; | |
| 1568 | 87 if(vcodec->extradata_size != 1) { |
| 88 vcodec->extradata_size = 1; | |
| 89 vcodec->extradata = av_malloc(1); | |
| 90 } | |
|
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2756
diff
changeset
|
91 vcodec->extradata[0] = get_byte(s->pb); |
| 1568 | 92 return 1; // 1 byte body size adjustment for flv_read_packet() |
| 3364 | 93 case FLV_CODECID_H264: |
| 94 vcodec->codec_id = CODEC_ID_H264; | |
| 95 return 3; // not 4, reading packet type will consume one byte | |
| 1568 | 96 default: |
| 97 av_log(s, AV_LOG_INFO, "Unsupported video codec (%x)\n", flv_codecid); | |
| 98 vcodec->codec_tag = flv_codecid; | |
| 99 } | |
| 100 | |
| 101 return 0; | |
| 102 } | |
| 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 | 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 | 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 | 118 static int amf_parse_object(AVFormatContext *s, AVStream *astream, AVStream *vstream, const char *key, int64_t max_pos, int depth) { |
| 1568 | 119 AVCodecContext *acodec, *vcodec; |
| 120 ByteIOContext *ioc; | |
| 121 AMFDataType amf_type; | |
| 122 char str_val[256]; | |
| 123 double num_val; | |
| 124 | |
| 125 num_val = 0; | |
|
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2756
diff
changeset
|
126 ioc = s->pb; |
| 1568 | 127 |
| 128 amf_type = get_byte(ioc); | |
| 129 | |
| 130 switch(amf_type) { | |
| 131 case AMF_DATA_TYPE_NUMBER: | |
| 132 num_val = av_int2dbl(get_be64(ioc)); break; | |
| 133 case AMF_DATA_TYPE_BOOL: | |
| 134 num_val = get_byte(ioc); break; | |
| 135 case AMF_DATA_TYPE_STRING: | |
| 136 if(amf_get_string(ioc, str_val, sizeof(str_val)) < 0) | |
| 137 return -1; | |
| 138 break; | |
| 139 case AMF_DATA_TYPE_OBJECT: { | |
| 140 unsigned int keylen; | |
| 141 | |
| 142 while(url_ftell(ioc) < max_pos - 2 && (keylen = get_be16(ioc))) { | |
| 143 url_fskip(ioc, keylen); //skip key string | |
| 144 if(amf_parse_object(s, NULL, NULL, NULL, max_pos, depth + 1) < 0) | |
| 145 return -1; //if we couldn't skip, bomb out. | |
| 146 } | |
| 147 if(get_byte(ioc) != AMF_END_OF_OBJECT) | |
| 148 return -1; | |
| 149 } | |
| 150 break; | |
| 151 case AMF_DATA_TYPE_NULL: | |
| 152 case AMF_DATA_TYPE_UNDEFINED: | |
| 153 case AMF_DATA_TYPE_UNSUPPORTED: | |
| 154 break; //these take up no additional space | |
| 155 case AMF_DATA_TYPE_MIXEDARRAY: | |
| 156 url_fskip(ioc, 4); //skip 32-bit max array index | |
| 157 while(url_ftell(ioc) < max_pos - 2 && amf_get_string(ioc, str_val, sizeof(str_val)) > 0) { | |
| 158 //this is the only case in which we would want a nested parse to not skip over the object | |
| 159 if(amf_parse_object(s, astream, vstream, str_val, max_pos, depth + 1) < 0) | |
| 160 return -1; | |
| 161 } | |
| 162 if(get_byte(ioc) != AMF_END_OF_OBJECT) | |
| 163 return -1; | |
| 164 break; | |
| 165 case AMF_DATA_TYPE_ARRAY: { | |
| 166 unsigned int arraylen, i; | |
| 167 | |
| 168 arraylen = get_be32(ioc); | |
| 169 for(i = 0; i < arraylen && url_ftell(ioc) < max_pos - 1; i++) { | |
| 170 if(amf_parse_object(s, NULL, NULL, NULL, max_pos, depth + 1) < 0) | |
| 171 return -1; //if we couldn't skip, bomb out. | |
| 172 } | |
| 173 } | |
| 174 break; | |
| 175 case AMF_DATA_TYPE_DATE: | |
| 176 url_fskip(ioc, 8 + 2); //timestamp (double) and UTC offset (int16) | |
| 177 break; | |
| 178 default: //unsupported type, we couldn't skip | |
| 179 return -1; | |
| 180 } | |
| 181 | |
| 182 if(depth == 1 && key) { //only look for metadata values when we are not nested and key != NULL | |
| 183 acodec = astream ? astream->codec : NULL; | |
| 184 vcodec = vstream ? vstream->codec : NULL; | |
| 185 | |
| 186 if(amf_type == AMF_DATA_TYPE_BOOL) { | |
| 187 if(!strcmp(key, "stereo") && acodec) acodec->channels = num_val > 0 ? 2 : 1; | |
| 188 } else if(amf_type == AMF_DATA_TYPE_NUMBER) { | |
| 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 | 200 //we may have to rewrite a previously read codecid because FLV only marks PCM endianness. |
| 201 if(num_val == 8 && (acodec->codec_id == CODEC_ID_PCM_S16BE || acodec->codec_id == CODEC_ID_PCM_S16LE)) | |
| 202 acodec->codec_id = CODEC_ID_PCM_S8; | |
| 203 } | |
| 204 else if(!strcmp(key, "audiosamplerate") && acodec && num_val >= 0) { | |
| 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 | 207 switch((int)num_val) { |
| 208 case 44000: acodec->sample_rate = 44100 ; break; | |
| 209 case 22000: acodec->sample_rate = 22050 ; break; | |
| 210 case 11000: acodec->sample_rate = 11025 ; break; | |
| 211 case 5000 : acodec->sample_rate = 5512 ; break; | |
| 212 default : acodec->sample_rate = num_val; | |
| 213 } | |
|
2847
f2a69a8c657d
Correctly handle FLV_CODECID_NELLYMOSER_8HZ_MONO files
banan
parents:
2771
diff
changeset
|
214 } |
| 1568 | 215 } |
| 216 } | |
| 217 } | |
| 218 | |
| 219 return 0; | |
| 220 } | |
| 221 | |
| 4005 | 222 static int flv_read_metabody(AVFormatContext *s, int64_t next_pos) { |
| 1568 | 223 AMFDataType type; |
| 224 AVStream *stream, *astream, *vstream; | |
| 225 ByteIOContext *ioc; | |
|
4887
acb51f192e13
Remove unused variable from flv_read_metabody() found by CSA.
michael
parents:
4863
diff
changeset
|
226 int i; |
| 1568 | 227 char buffer[11]; //only needs to hold the string "onMetaData". Anything longer is something we don't want. |
| 228 | |
| 229 astream = NULL; | |
| 230 vstream = NULL; | |
|
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2756
diff
changeset
|
231 ioc = s->pb; |
| 1568 | 232 |
| 233 //first object needs to be "onMetaData" string | |
| 234 type = get_byte(ioc); | |
| 235 if(type != AMF_DATA_TYPE_STRING || amf_get_string(ioc, buffer, sizeof(buffer)) < 0 || strcmp(buffer, "onMetaData")) | |
| 236 return -1; | |
| 237 | |
| 238 //find the streams now so that amf_parse_object doesn't need to do the lookup every time it is called. | |
| 239 for(i = 0; i < s->nb_streams; i++) { | |
| 240 stream = s->streams[i]; | |
| 241 if (stream->codec->codec_type == CODEC_TYPE_AUDIO) astream = stream; | |
| 242 else if(stream->codec->codec_type == CODEC_TYPE_VIDEO) vstream = stream; | |
| 243 } | |
| 244 | |
| 245 //parse the second object (we want a mixed array) | |
| 246 if(amf_parse_object(s, astream, vstream, buffer, next_pos, 0) < 0) | |
| 247 return -1; | |
| 248 | |
| 249 return 0; | |
| 250 } | |
| 251 | |
| 2691 | 252 static AVStream *create_stream(AVFormatContext *s, int is_audio){ |
| 253 AVStream *st = av_new_stream(s, is_audio); | |
| 254 if (!st) | |
| 255 return NULL; | |
| 256 st->codec->codec_type = is_audio ? CODEC_TYPE_AUDIO : CODEC_TYPE_VIDEO; | |
| 3335 | 257 av_set_pts_info(st, 32, 1, 1000); /* 32 bit pts in ms */ |
| 2691 | 258 return st; |
| 259 } | |
| 260 | |
|
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
261 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
|
262 AVFormatParameters *ap) |
|
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
263 { |
|
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
|
264 int offset, flags; |
|
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
265 |
|
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2756
diff
changeset
|
266 url_fskip(s->pb, 4); |
|
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2756
diff
changeset
|
267 flags = get_byte(s->pb); |
| 1886 | 268 /* old flvtool cleared this field */ |
| 269 /* FIXME: better fix needed */ | |
| 270 if (!flags) { | |
| 271 flags = FLV_HEADER_FLAG_HASVIDEO | FLV_HEADER_FLAG_HASAUDIO; | |
| 272 av_log(s, AV_LOG_WARNING, "Broken FLV file, which says no streams present, this might fail\n"); | |
| 273 } | |
|
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
274 |
| 3218 | 275 if((flags & (FLV_HEADER_FLAG_HASVIDEO|FLV_HEADER_FLAG_HASAUDIO)) |
| 276 != (FLV_HEADER_FLAG_HASVIDEO|FLV_HEADER_FLAG_HASAUDIO)) | |
| 277 s->ctx_flags |= AVFMTCTX_NOHEADER; | |
| 278 | |
|
1559
515e80ef01e6
get rid of AVFMTCTX_NOHEADER, create streams in read_header()
michael
parents:
1553
diff
changeset
|
279 if(flags & FLV_HEADER_FLAG_HASVIDEO){ |
| 2691 | 280 if(!create_stream(s, 0)) |
|
2273
7eb456c4ed8a
Replace all occurrences of AVERROR_NOMEM with AVERROR(ENOMEM).
takis
parents:
2216
diff
changeset
|
281 return AVERROR(ENOMEM); |
|
1559
515e80ef01e6
get rid of AVFMTCTX_NOHEADER, create streams in read_header()
michael
parents:
1553
diff
changeset
|
282 } |
|
515e80ef01e6
get rid of AVFMTCTX_NOHEADER, create streams in read_header()
michael
parents:
1553
diff
changeset
|
283 if(flags & FLV_HEADER_FLAG_HASAUDIO){ |
| 2691 | 284 if(!create_stream(s, 1)) |
|
2273
7eb456c4ed8a
Replace all occurrences of AVERROR_NOMEM with AVERROR(ENOMEM).
takis
parents:
2216
diff
changeset
|
285 return AVERROR(ENOMEM); |
|
1559
515e80ef01e6
get rid of AVFMTCTX_NOHEADER, create streams in read_header()
michael
parents:
1553
diff
changeset
|
286 } |
|
515e80ef01e6
get rid of AVFMTCTX_NOHEADER, create streams in read_header()
michael
parents:
1553
diff
changeset
|
287 |
|
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2756
diff
changeset
|
288 offset = get_be32(s->pb); |
|
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2756
diff
changeset
|
289 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
|
290 |
| 1318 | 291 s->start_time = 0; |
| 292 | |
|
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
293 return 0; |
|
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
294 } |
|
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
295 |
| 3364 | 296 static int flv_get_extradata(AVFormatContext *s, AVStream *st, int size) |
| 297 { | |
| 298 av_free(st->codec->extradata); | |
| 299 st->codec->extradata = av_mallocz(size + FF_INPUT_BUFFER_PADDING_SIZE); | |
| 300 if (!st->codec->extradata) | |
| 301 return AVERROR(ENOMEM); | |
| 302 st->codec->extradata_size = size; | |
| 303 get_buffer(s->pb, st->codec->extradata, st->codec->extradata_size); | |
| 304 return 0; | |
| 305 } | |
| 306 | |
|
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
307 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
|
308 { |
| 4034 | 309 FLVContext *flv = s->priv_data; |
| 4005 | 310 int ret, i, type, size, flags, is_audio; |
| 311 int64_t next, pos; | |
| 4034 | 312 int64_t dts, pts = AV_NOPTS_VALUE; |
| 679 | 313 AVStream *st = NULL; |
| 885 | 314 |
| 445 | 315 for(;;){ |
|
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2756
diff
changeset
|
316 pos = url_ftell(s->pb); |
|
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2756
diff
changeset
|
317 url_fskip(s->pb, 4); /* size of previous packet */ |
|
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2756
diff
changeset
|
318 type = get_byte(s->pb); |
|
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2756
diff
changeset
|
319 size = get_be24(s->pb); |
| 3336 | 320 dts = get_be24(s->pb); |
| 321 dts |= get_byte(s->pb) << 24; | |
| 322 // 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
|
323 if (url_feof(s->pb)) |
|
4542
241a66d33f49
FLV demuxer: return AVERROR_EOF upon detection of end of file.
pross
parents:
4509
diff
changeset
|
324 return AVERROR_EOF; |
|
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2756
diff
changeset
|
325 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
|
326 flags = 0; |
| 885 | 327 |
| 445 | 328 if(size == 0) |
| 329 continue; | |
| 885 | 330 |
|
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2756
diff
changeset
|
331 next= size + url_ftell(s->pb); |
| 821 | 332 |
|
1553
504ceaa50e31
Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents:
1415
diff
changeset
|
333 if (type == FLV_TAG_TYPE_AUDIO) { |
| 445 | 334 is_audio=1; |
|
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2756
diff
changeset
|
335 flags = get_byte(s->pb); |
| 3797 | 336 size--; |
|
1553
504ceaa50e31
Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents:
1415
diff
changeset
|
337 } else if (type == FLV_TAG_TYPE_VIDEO) { |
| 445 | 338 is_audio=0; |
|
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2756
diff
changeset
|
339 flags = get_byte(s->pb); |
| 3797 | 340 size--; |
| 3798 | 341 if ((flags & 0xf0) == 0x50) /* video info / command frame */ |
| 342 goto skip; | |
|
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
343 } else { |
|
4863
0793a33d775f
Disable metadata reading. Yes, I would like to know what this code is good for
michael
parents:
4811
diff
changeset
|
344 if (type == FLV_TAG_TYPE_META && size > 13+1+4 && 0) |
| 1568 | 345 flv_read_metabody(s, next); |
| 346 else /* skip packet */ | |
| 347 av_log(s, AV_LOG_ERROR, "skipping flv packet: type %d, size %d, flags %d\n", type, size, flags); | |
| 3798 | 348 skip: |
|
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2756
diff
changeset
|
349 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
|
350 continue; |
|
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
351 } |
|
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
352 |
| 3799 | 353 /* skip empty data packets */ |
| 354 if (!size) | |
| 355 continue; | |
| 356 | |
|
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
357 /* now find stream */ |
|
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
358 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
|
359 st = s->streams[i]; |
| 445 | 360 if (st->id == is_audio) |
| 361 break; | |
| 362 } | |
| 363 if(i == s->nb_streams){ | |
| 4509 | 364 av_log(s, AV_LOG_ERROR, "invalid stream\n"); |
| 2692 | 365 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
|
366 s->ctx_flags &= ~AVFMTCTX_NOHEADER; |
|
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
367 } |
| 4509 | 368 // 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
|
369 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
|
370 ||(st->discard >= AVDISCARD_BIDIR && ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_DISP_INTER && !is_audio)) |
| 708 | 371 || st->discard >= AVDISCARD_ALL |
| 372 ){ | |
|
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2756
diff
changeset
|
373 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
|
374 continue; |
| 652 | 375 } |
|
1553
504ceaa50e31
Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents:
1415
diff
changeset
|
376 if ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY) |
| 3336 | 377 av_add_index_entry(st, pos, dts, size, 0, AVINDEX_KEYFRAME); |
| 445 | 378 break; |
| 379 } | |
|
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
380 |
|
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
|
381 // 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
|
382 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
|
383 int size; |
| 4005 | 384 const int64_t pos= url_ftell(s->pb); |
| 385 const int64_t fsize= url_fsize(s->pb); | |
|
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2756
diff
changeset
|
386 url_fseek(s->pb, fsize-4, SEEK_SET); |
|
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2756
diff
changeset
|
387 size= get_be32(s->pb); |
|
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2756
diff
changeset
|
388 url_fseek(s->pb, fsize-3-size, SEEK_SET); |
|
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2756
diff
changeset
|
389 if(size == get_be24(s->pb) + 11){ |
|
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2756
diff
changeset
|
390 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
|
391 } |
|
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2756
diff
changeset
|
392 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
|
393 } |
|
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 |
| 445 | 395 if(is_audio){ |
|
4125
df6989f6122b
Fix detection of audio codec in K70707-ARIA229.flv.
michael
parents:
4034
diff
changeset
|
396 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
|
397 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
|
398 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
|
399 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
|
400 } |
|
df6989f6122b
Fix detection of audio codec in K70707-ARIA229.flv.
michael
parents:
4034
diff
changeset
|
401 if(!st->codec->codec_id){ |
| 1568 | 402 flv_set_audio_codec(s, st, flags & FLV_AUDIO_CODECID_MASK); |
| 445 | 403 } |
| 404 }else{ | |
| 1568 | 405 size -= flv_set_video_codec(s, st, flags & FLV_VIDEO_CODECID_MASK); |
| 378 | 406 } |
| 407 | |
| 3364 | 408 if (st->codec->codec_id == CODEC_ID_AAC || |
| 409 st->codec->codec_id == CODEC_ID_H264) { | |
| 410 int type = get_byte(s->pb); | |
| 411 size--; | |
| 412 if (st->codec->codec_id == CODEC_ID_H264) { | |
| 4034 | 413 int32_t cts = (get_be24(s->pb)+0xff800000)^0xff800000; // sign extension |
| 414 pts = dts + cts; | |
| 415 if (cts < 0) { // dts are wrong | |
| 416 flv->wrong_dts = 1; | |
| 417 av_log(s, AV_LOG_WARNING, "negative cts, previous timestamps might be wrong\n"); | |
| 418 } | |
| 419 if (flv->wrong_dts) | |
| 420 dts = AV_NOPTS_VALUE; | |
| 3364 | 421 } |
| 422 if (type == 0) { | |
| 3797 | 423 if ((ret = flv_get_extradata(s, st, size)) < 0) |
| 3364 | 424 return ret; |
|
4559
ee5d7f52e4bc
parse aac extradata to fetch channels and sample rate, patch from Netgem
bcoudurier
parents:
4542
diff
changeset
|
425 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
|
426 MPEG4AudioConfig cfg; |
|
ee5d7f52e4bc
parse aac extradata to fetch channels and sample rate, patch from Netgem
bcoudurier
parents:
4542
diff
changeset
|
427 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
|
428 st->codec->extradata_size); |
|
ee5d7f52e4bc
parse aac extradata to fetch channels and sample rate, patch from Netgem
bcoudurier
parents:
4542
diff
changeset
|
429 if (cfg.chan_config > 7) |
|
ee5d7f52e4bc
parse aac extradata to fetch channels and sample rate, patch from Netgem
bcoudurier
parents:
4542
diff
changeset
|
430 return -1; |
|
ee5d7f52e4bc
parse aac extradata to fetch channels and sample rate, patch from Netgem
bcoudurier
parents:
4542
diff
changeset
|
431 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
|
432 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
|
433 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
|
434 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
|
435 } |
|
ee5d7f52e4bc
parse aac extradata to fetch channels and sample rate, patch from Netgem
bcoudurier
parents:
4542
diff
changeset
|
436 |
|
4271
f9ec55b30dfa
Use EAGAIN return, primarely intended as example of EAGAIN useage.
michael
parents:
4251
diff
changeset
|
437 return AVERROR(EAGAIN); |
| 3364 | 438 } |
| 439 } | |
| 440 | |
| 4805 | 441 /* skip empty data packets */ |
| 442 if (!size) | |
| 443 return AVERROR(EAGAIN); | |
| 444 | |
| 3797 | 445 ret= av_get_packet(s->pb, pkt, size); |
| 4811 | 446 if (ret < 0) { |
|
2274
b21c2af60bc9
Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents:
2273
diff
changeset
|
447 return AVERROR(EIO); |
|
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
448 } |
|
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
449 /* 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
|
450 packet */ |
|
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
451 pkt->size = ret; |
| 3336 | 452 pkt->dts = dts; |
| 4034 | 453 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
|
454 pkt->stream_index = st->index; |
| 885 | 455 |
|
1553
504ceaa50e31
Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents:
1415
diff
changeset
|
456 if (is_audio || ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY)) |
| 887 | 457 pkt->flags |= PKT_FLAG_KEY; |
| 885 | 458 |
|
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
459 return ret; |
|
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
460 } |
|
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
461 |
| 1167 | 462 AVInputFormat flv_demuxer = { |
|
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
463 "flv", |
|
3424
7a0230981402
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents:
3364
diff
changeset
|
464 NULL_IF_CONFIG_SMALL("FLV format"), |
| 4034 | 465 sizeof(FLVContext), |
|
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
466 flv_probe, |
|
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
467 flv_read_header, |
|
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
468 flv_read_packet, |
|
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
469 .extensions = "flv", |
|
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
470 .value = CODEC_ID_FLV1, |
|
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
471 }; |
