Mercurial > libavformat.hg
annotate flvdec.c @ 5109:293c03f0d47f libavformat
Add handling of EAGAIN at packet boundaries. See "[PATCH] RTSP-MS 14/15:
ASF packet parsing" thread for discussion / reasoning.
author | rbultje |
---|---|
date | Sun, 26 Jul 2009 19:09:35 +0000 |
parents | 44a0fab134a9 |
children | e562b793c959 |
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 |
5097
453175c733c4
flvdec: expose metadata through the generic metadata API
aurel
parents:
5096
diff
changeset
|
27 #include "libavutil/avstring.h" |
5066
2bc8a9853970
flvdec: Build a Speex header during FLV demuxing using required and
jbr
parents:
5037
diff
changeset
|
28 #include "libavcodec/bytestream.h" |
4559
ee5d7f52e4bc
parse aac extradata to fetch channels and sample rate, patch from Netgem
bcoudurier
parents:
4542
diff
changeset
|
29 #include "libavcodec/mpeg4audio.h" |
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
30 #include "avformat.h" |
1553
504ceaa50e31
Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents:
1415
diff
changeset
|
31 #include "flv.h" |
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
32 |
4034 | 33 typedef struct { |
34 int wrong_dts; ///< wrong dts due to negative cts | |
35 } FLVContext; | |
36 | |
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
37 static int flv_probe(AVProbeData *p) |
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 const uint8_t *d; |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
40 |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
41 d = p->buf; |
1718 | 42 if (d[0] == 'F' && d[1] == 'L' && d[2] == 'V' && d[3] < 5 && d[5]==0) { |
43 return AVPROBE_SCORE_MAX; | |
164
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 return 0; |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
46 } |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
47 |
5066
2bc8a9853970
flvdec: Build a Speex header during FLV demuxing using required and
jbr
parents:
5037
diff
changeset
|
48 /** |
2bc8a9853970
flvdec: Build a Speex header during FLV demuxing using required and
jbr
parents:
5037
diff
changeset
|
49 * Builds a Speex header. |
2bc8a9853970
flvdec: Build a Speex header during FLV demuxing using required and
jbr
parents:
5037
diff
changeset
|
50 * This is not needed for the libavcodec libspeex decoder, but is needed for |
2bc8a9853970
flvdec: Build a Speex header during FLV demuxing using required and
jbr
parents:
5037
diff
changeset
|
51 * stream copy and for decoders which require a header. |
2bc8a9853970
flvdec: Build a Speex header during FLV demuxing using required and
jbr
parents:
5037
diff
changeset
|
52 */ |
2bc8a9853970
flvdec: Build a Speex header during FLV demuxing using required and
jbr
parents:
5037
diff
changeset
|
53 static void flv_build_speex_header(uint8_t *extradata) |
2bc8a9853970
flvdec: Build a Speex header during FLV demuxing using required and
jbr
parents:
5037
diff
changeset
|
54 { |
2bc8a9853970
flvdec: Build a Speex header during FLV demuxing using required and
jbr
parents:
5037
diff
changeset
|
55 memset(extradata, 0, 80); |
2bc8a9853970
flvdec: Build a Speex header during FLV demuxing using required and
jbr
parents:
5037
diff
changeset
|
56 bytestream_put_buffer(&extradata, "Speex ", 8); // speex_string |
2bc8a9853970
flvdec: Build a Speex header during FLV demuxing using required and
jbr
parents:
5037
diff
changeset
|
57 bytestream_put_buffer(&extradata, "1.2rc1", 6); // speex_version |
2bc8a9853970
flvdec: Build a Speex header during FLV demuxing using required and
jbr
parents:
5037
diff
changeset
|
58 extradata += 14; // speex_version padding |
2bc8a9853970
flvdec: Build a Speex header during FLV demuxing using required and
jbr
parents:
5037
diff
changeset
|
59 bytestream_put_le32(&extradata, 1); // speex_version_id |
2bc8a9853970
flvdec: Build a Speex header during FLV demuxing using required and
jbr
parents:
5037
diff
changeset
|
60 bytestream_put_le32(&extradata, 80); // header_size |
2bc8a9853970
flvdec: Build a Speex header during FLV demuxing using required and
jbr
parents:
5037
diff
changeset
|
61 bytestream_put_le32(&extradata, 16000); // rate |
2bc8a9853970
flvdec: Build a Speex header during FLV demuxing using required and
jbr
parents:
5037
diff
changeset
|
62 bytestream_put_le32(&extradata, 1); // mode |
2bc8a9853970
flvdec: Build a Speex header during FLV demuxing using required and
jbr
parents:
5037
diff
changeset
|
63 bytestream_put_le32(&extradata, 4); // mode_bitstream_version |
2bc8a9853970
flvdec: Build a Speex header during FLV demuxing using required and
jbr
parents:
5037
diff
changeset
|
64 bytestream_put_le32(&extradata, 1); // nb_channels |
2bc8a9853970
flvdec: Build a Speex header during FLV demuxing using required and
jbr
parents:
5037
diff
changeset
|
65 bytestream_put_le32(&extradata, -1); // bitrate |
2bc8a9853970
flvdec: Build a Speex header during FLV demuxing using required and
jbr
parents:
5037
diff
changeset
|
66 bytestream_put_le32(&extradata, 320); // frame_size |
2bc8a9853970
flvdec: Build a Speex header during FLV demuxing using required and
jbr
parents:
5037
diff
changeset
|
67 // vbr = 0 |
2bc8a9853970
flvdec: Build a Speex header during FLV demuxing using required and
jbr
parents:
5037
diff
changeset
|
68 // frames_per_packet = 0 |
2bc8a9853970
flvdec: Build a Speex header during FLV demuxing using required and
jbr
parents:
5037
diff
changeset
|
69 // extra_headers = 0 |
2bc8a9853970
flvdec: Build a Speex header during FLV demuxing using required and
jbr
parents:
5037
diff
changeset
|
70 // reserved1 = 0 |
2bc8a9853970
flvdec: Build a Speex header during FLV demuxing using required and
jbr
parents:
5037
diff
changeset
|
71 // reserved2 = 0 |
2bc8a9853970
flvdec: Build a Speex header during FLV demuxing using required and
jbr
parents:
5037
diff
changeset
|
72 } |
2bc8a9853970
flvdec: Build a Speex header during FLV demuxing using required and
jbr
parents:
5037
diff
changeset
|
73 |
1568 | 74 static void flv_set_audio_codec(AVFormatContext *s, AVStream *astream, int flv_codecid) { |
75 AVCodecContext *acodec = astream->codec; | |
76 switch(flv_codecid) { | |
77 //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
|
78 case FLV_CODECID_PCM: |
3908
1d3d17de20ba
Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents:
3799
diff
changeset
|
79 acodec->codec_id = acodec->bits_per_coded_sample == 8 ? CODEC_ID_PCM_S8 : |
5108 | 80 #if HAVE_BIGENDIAN |
3062 | 81 CODEC_ID_PCM_S16BE; |
82 #else | |
83 CODEC_ID_PCM_S16LE; | |
84 #endif | |
85 break; | |
1568 | 86 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
|
87 acodec->codec_id = acodec->bits_per_coded_sample == 8 ? CODEC_ID_PCM_S8 : CODEC_ID_PCM_S16LE; break; |
3364 | 88 case FLV_CODECID_AAC : acodec->codec_id = CODEC_ID_AAC; break; |
1568 | 89 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
|
90 case FLV_CODECID_SPEEX: |
cf359952a1fc
force sample rate to 16khz for speex in flv, fix speexaudio.flv
bcoudurier
parents:
4005
diff
changeset
|
91 acodec->codec_id = CODEC_ID_SPEEX; |
cf359952a1fc
force sample rate to 16khz for speex in flv, fix speexaudio.flv
bcoudurier
parents:
4005
diff
changeset
|
92 acodec->sample_rate = 16000; |
5066
2bc8a9853970
flvdec: Build a Speex header during FLV demuxing using required and
jbr
parents:
5037
diff
changeset
|
93 acodec->extradata = av_mallocz(80 + FF_INPUT_BUFFER_PADDING_SIZE); |
2bc8a9853970
flvdec: Build a Speex header during FLV demuxing using required and
jbr
parents:
5037
diff
changeset
|
94 if (acodec->extradata) { |
2bc8a9853970
flvdec: Build a Speex header during FLV demuxing using required and
jbr
parents:
5037
diff
changeset
|
95 acodec->extradata_size = 80; |
2bc8a9853970
flvdec: Build a Speex header during FLV demuxing using required and
jbr
parents:
5037
diff
changeset
|
96 flv_build_speex_header(acodec->extradata); |
2bc8a9853970
flvdec: Build a Speex header during FLV demuxing using required and
jbr
parents:
5037
diff
changeset
|
97 } else { |
2bc8a9853970
flvdec: Build a Speex header during FLV demuxing using required and
jbr
parents:
5037
diff
changeset
|
98 av_log(s, AV_LOG_WARNING, "Unable to create Speex extradata\n"); |
2bc8a9853970
flvdec: Build a Speex header during FLV demuxing using required and
jbr
parents:
5037
diff
changeset
|
99 } |
4006
cf359952a1fc
force sample rate to 16khz for speex in flv, fix speexaudio.flv
bcoudurier
parents:
4005
diff
changeset
|
100 break; |
2023 | 101 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
|
102 case FLV_CODECID_NELLYMOSER_8KHZ_MONO: |
1568 | 103 acodec->sample_rate = 8000; //in case metadata does not otherwise declare samplerate |
104 case FLV_CODECID_NELLYMOSER: | |
2604 | 105 acodec->codec_id = CODEC_ID_NELLYMOSER; |
106 break; | |
1568 | 107 default: |
108 av_log(s, AV_LOG_INFO, "Unsupported audio codec (%x)\n", flv_codecid >> FLV_AUDIO_CODECID_OFFSET); | |
109 acodec->codec_tag = flv_codecid >> FLV_AUDIO_CODECID_OFFSET; | |
110 } | |
111 } | |
112 | |
113 static int flv_set_video_codec(AVFormatContext *s, AVStream *vstream, int flv_codecid) { | |
114 AVCodecContext *vcodec = vstream->codec; | |
115 switch(flv_codecid) { | |
116 case FLV_CODECID_H263 : vcodec->codec_id = CODEC_ID_FLV1 ; break; | |
117 case FLV_CODECID_SCREEN: vcodec->codec_id = CODEC_ID_FLASHSV; break; | |
118 case FLV_CODECID_VP6 : vcodec->codec_id = CODEC_ID_VP6F ; | |
2572 | 119 case FLV_CODECID_VP6A : |
120 if(flv_codecid == FLV_CODECID_VP6A) | |
121 vcodec->codec_id = CODEC_ID_VP6A; | |
1568 | 122 if(vcodec->extradata_size != 1) { |
123 vcodec->extradata_size = 1; | |
124 vcodec->extradata = av_malloc(1); | |
125 } | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2756
diff
changeset
|
126 vcodec->extradata[0] = get_byte(s->pb); |
1568 | 127 return 1; // 1 byte body size adjustment for flv_read_packet() |
3364 | 128 case FLV_CODECID_H264: |
129 vcodec->codec_id = CODEC_ID_H264; | |
130 return 3; // not 4, reading packet type will consume one byte | |
1568 | 131 default: |
132 av_log(s, AV_LOG_INFO, "Unsupported video codec (%x)\n", flv_codecid); | |
133 vcodec->codec_tag = flv_codecid; | |
134 } | |
135 | |
136 return 0; | |
137 } | |
138 | |
1560
f59b66f9d679
amf_get_string() by Allan Hsu allan aat counterpop doot net
michael
parents:
1559
diff
changeset
|
139 static int amf_get_string(ByteIOContext *ioc, char *buffer, int buffsize) { |
1561 | 140 int length = get_be16(ioc); |
1560
f59b66f9d679
amf_get_string() by Allan Hsu allan aat counterpop doot net
michael
parents:
1559
diff
changeset
|
141 if(length >= buffsize) { |
f59b66f9d679
amf_get_string() by Allan Hsu allan aat counterpop doot net
michael
parents:
1559
diff
changeset
|
142 url_fskip(ioc, length); |
1561 | 143 return -1; |
1560
f59b66f9d679
amf_get_string() by Allan Hsu allan aat counterpop doot net
michael
parents:
1559
diff
changeset
|
144 } |
f59b66f9d679
amf_get_string() by Allan Hsu allan aat counterpop doot net
michael
parents:
1559
diff
changeset
|
145 |
f59b66f9d679
amf_get_string() by Allan Hsu allan aat counterpop doot net
michael
parents:
1559
diff
changeset
|
146 get_buffer(ioc, buffer, length); |
f59b66f9d679
amf_get_string() by Allan Hsu allan aat counterpop doot net
michael
parents:
1559
diff
changeset
|
147 |
f59b66f9d679
amf_get_string() by Allan Hsu allan aat counterpop doot net
michael
parents:
1559
diff
changeset
|
148 buffer[length] = '\0'; |
f59b66f9d679
amf_get_string() by Allan Hsu allan aat counterpop doot net
michael
parents:
1559
diff
changeset
|
149 |
f59b66f9d679
amf_get_string() by Allan Hsu allan aat counterpop doot net
michael
parents:
1559
diff
changeset
|
150 return length; |
f59b66f9d679
amf_get_string() by Allan Hsu allan aat counterpop doot net
michael
parents:
1559
diff
changeset
|
151 } |
f59b66f9d679
amf_get_string() by Allan Hsu allan aat counterpop doot net
michael
parents:
1559
diff
changeset
|
152 |
4005 | 153 static int amf_parse_object(AVFormatContext *s, AVStream *astream, AVStream *vstream, const char *key, int64_t max_pos, int depth) { |
1568 | 154 AVCodecContext *acodec, *vcodec; |
155 ByteIOContext *ioc; | |
156 AMFDataType amf_type; | |
157 char str_val[256]; | |
158 double num_val; | |
159 | |
160 num_val = 0; | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2756
diff
changeset
|
161 ioc = s->pb; |
1568 | 162 |
163 amf_type = get_byte(ioc); | |
164 | |
165 switch(amf_type) { | |
166 case AMF_DATA_TYPE_NUMBER: | |
167 num_val = av_int2dbl(get_be64(ioc)); break; | |
168 case AMF_DATA_TYPE_BOOL: | |
169 num_val = get_byte(ioc); break; | |
170 case AMF_DATA_TYPE_STRING: | |
171 if(amf_get_string(ioc, str_val, sizeof(str_val)) < 0) | |
172 return -1; | |
173 break; | |
174 case AMF_DATA_TYPE_OBJECT: { | |
175 unsigned int keylen; | |
176 | |
177 while(url_ftell(ioc) < max_pos - 2 && (keylen = get_be16(ioc))) { | |
178 url_fskip(ioc, keylen); //skip key string | |
179 if(amf_parse_object(s, NULL, NULL, NULL, max_pos, depth + 1) < 0) | |
180 return -1; //if we couldn't skip, bomb out. | |
181 } | |
182 if(get_byte(ioc) != AMF_END_OF_OBJECT) | |
183 return -1; | |
184 } | |
185 break; | |
186 case AMF_DATA_TYPE_NULL: | |
187 case AMF_DATA_TYPE_UNDEFINED: | |
188 case AMF_DATA_TYPE_UNSUPPORTED: | |
189 break; //these take up no additional space | |
190 case AMF_DATA_TYPE_MIXEDARRAY: | |
191 url_fskip(ioc, 4); //skip 32-bit max array index | |
192 while(url_ftell(ioc) < max_pos - 2 && amf_get_string(ioc, str_val, sizeof(str_val)) > 0) { | |
193 //this is the only case in which we would want a nested parse to not skip over the object | |
194 if(amf_parse_object(s, astream, vstream, str_val, max_pos, depth + 1) < 0) | |
195 return -1; | |
196 } | |
197 if(get_byte(ioc) != AMF_END_OF_OBJECT) | |
198 return -1; | |
199 break; | |
200 case AMF_DATA_TYPE_ARRAY: { | |
201 unsigned int arraylen, i; | |
202 | |
203 arraylen = get_be32(ioc); | |
204 for(i = 0; i < arraylen && url_ftell(ioc) < max_pos - 1; i++) { | |
205 if(amf_parse_object(s, NULL, NULL, NULL, max_pos, depth + 1) < 0) | |
206 return -1; //if we couldn't skip, bomb out. | |
207 } | |
208 } | |
209 break; | |
210 case AMF_DATA_TYPE_DATE: | |
211 url_fskip(ioc, 8 + 2); //timestamp (double) and UTC offset (int16) | |
212 break; | |
213 default: //unsupported type, we couldn't skip | |
214 return -1; | |
215 } | |
216 | |
217 if(depth == 1 && key) { //only look for metadata values when we are not nested and key != NULL | |
218 acodec = astream ? astream->codec : NULL; | |
219 vcodec = vstream ? vstream->codec : NULL; | |
220 | |
221 if(amf_type == AMF_DATA_TYPE_BOOL) { | |
5097
453175c733c4
flvdec: expose metadata through the generic metadata API
aurel
parents:
5096
diff
changeset
|
222 av_strlcpy(str_val, num_val > 0 ? "true" : "false", sizeof(str_val)); |
453175c733c4
flvdec: expose metadata through the generic metadata API
aurel
parents:
5096
diff
changeset
|
223 av_metadata_set(&s->metadata, key, str_val); |
1568 | 224 } else if(amf_type == AMF_DATA_TYPE_NUMBER) { |
5097
453175c733c4
flvdec: expose metadata through the generic metadata API
aurel
parents:
5096
diff
changeset
|
225 snprintf(str_val, sizeof(str_val), "%.f", num_val); |
453175c733c4
flvdec: expose metadata through the generic metadata API
aurel
parents:
5096
diff
changeset
|
226 av_metadata_set(&s->metadata, key, str_val); |
1568 | 227 if(!strcmp(key, "duration")) s->duration = num_val * AV_TIME_BASE; |
4347
932720e90fc5
Implement the reading of the video bitrate of flv movies out of the meta data,
benoit
parents:
4271
diff
changeset
|
228 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
|
229 vcodec->bit_rate = num_val * 1024.0; |
5097
453175c733c4
flvdec: expose metadata through the generic metadata API
aurel
parents:
5096
diff
changeset
|
230 } else if (amf_type == AMF_DATA_TYPE_STRING) |
453175c733c4
flvdec: expose metadata through the generic metadata API
aurel
parents:
5096
diff
changeset
|
231 av_metadata_set(&s->metadata, key, str_val); |
1568 | 232 } |
233 | |
234 return 0; | |
235 } | |
236 | |
4005 | 237 static int flv_read_metabody(AVFormatContext *s, int64_t next_pos) { |
1568 | 238 AMFDataType type; |
239 AVStream *stream, *astream, *vstream; | |
240 ByteIOContext *ioc; | |
4887
acb51f192e13
Remove unused variable from flv_read_metabody() found by CSA.
michael
parents:
4863
diff
changeset
|
241 int i; |
1568 | 242 char buffer[11]; //only needs to hold the string "onMetaData". Anything longer is something we don't want. |
243 | |
244 astream = NULL; | |
245 vstream = NULL; | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2756
diff
changeset
|
246 ioc = s->pb; |
1568 | 247 |
248 //first object needs to be "onMetaData" string | |
249 type = get_byte(ioc); | |
250 if(type != AMF_DATA_TYPE_STRING || amf_get_string(ioc, buffer, sizeof(buffer)) < 0 || strcmp(buffer, "onMetaData")) | |
251 return -1; | |
252 | |
253 //find the streams now so that amf_parse_object doesn't need to do the lookup every time it is called. | |
254 for(i = 0; i < s->nb_streams; i++) { | |
255 stream = s->streams[i]; | |
256 if (stream->codec->codec_type == CODEC_TYPE_AUDIO) astream = stream; | |
257 else if(stream->codec->codec_type == CODEC_TYPE_VIDEO) vstream = stream; | |
258 } | |
259 | |
260 //parse the second object (we want a mixed array) | |
261 if(amf_parse_object(s, astream, vstream, buffer, next_pos, 0) < 0) | |
262 return -1; | |
263 | |
264 return 0; | |
265 } | |
266 | |
2691 | 267 static AVStream *create_stream(AVFormatContext *s, int is_audio){ |
268 AVStream *st = av_new_stream(s, is_audio); | |
269 if (!st) | |
270 return NULL; | |
271 st->codec->codec_type = is_audio ? CODEC_TYPE_AUDIO : CODEC_TYPE_VIDEO; | |
3335 | 272 av_set_pts_info(st, 32, 1, 1000); /* 32 bit pts in ms */ |
2691 | 273 return st; |
274 } | |
275 | |
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
276 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
|
277 AVFormatParameters *ap) |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
278 { |
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
|
279 int offset, flags; |
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
280 |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2756
diff
changeset
|
281 url_fskip(s->pb, 4); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2756
diff
changeset
|
282 flags = get_byte(s->pb); |
1886 | 283 /* old flvtool cleared this field */ |
284 /* FIXME: better fix needed */ | |
285 if (!flags) { | |
286 flags = FLV_HEADER_FLAG_HASVIDEO | FLV_HEADER_FLAG_HASAUDIO; | |
287 av_log(s, AV_LOG_WARNING, "Broken FLV file, which says no streams present, this might fail\n"); | |
288 } | |
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
289 |
3218 | 290 if((flags & (FLV_HEADER_FLAG_HASVIDEO|FLV_HEADER_FLAG_HASAUDIO)) |
291 != (FLV_HEADER_FLAG_HASVIDEO|FLV_HEADER_FLAG_HASAUDIO)) | |
292 s->ctx_flags |= AVFMTCTX_NOHEADER; | |
293 | |
1559
515e80ef01e6
get rid of AVFMTCTX_NOHEADER, create streams in read_header()
michael
parents:
1553
diff
changeset
|
294 if(flags & FLV_HEADER_FLAG_HASVIDEO){ |
2691 | 295 if(!create_stream(s, 0)) |
2273
7eb456c4ed8a
Replace all occurrences of AVERROR_NOMEM with AVERROR(ENOMEM).
takis
parents:
2216
diff
changeset
|
296 return AVERROR(ENOMEM); |
1559
515e80ef01e6
get rid of AVFMTCTX_NOHEADER, create streams in read_header()
michael
parents:
1553
diff
changeset
|
297 } |
515e80ef01e6
get rid of AVFMTCTX_NOHEADER, create streams in read_header()
michael
parents:
1553
diff
changeset
|
298 if(flags & FLV_HEADER_FLAG_HASAUDIO){ |
2691 | 299 if(!create_stream(s, 1)) |
2273
7eb456c4ed8a
Replace all occurrences of AVERROR_NOMEM with AVERROR(ENOMEM).
takis
parents:
2216
diff
changeset
|
300 return AVERROR(ENOMEM); |
1559
515e80ef01e6
get rid of AVFMTCTX_NOHEADER, create streams in read_header()
michael
parents:
1553
diff
changeset
|
301 } |
515e80ef01e6
get rid of AVFMTCTX_NOHEADER, create streams in read_header()
michael
parents:
1553
diff
changeset
|
302 |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2756
diff
changeset
|
303 offset = get_be32(s->pb); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2756
diff
changeset
|
304 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
|
305 |
1318 | 306 s->start_time = 0; |
307 | |
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
308 return 0; |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
309 } |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
310 |
3364 | 311 static int flv_get_extradata(AVFormatContext *s, AVStream *st, int size) |
312 { | |
313 av_free(st->codec->extradata); | |
314 st->codec->extradata = av_mallocz(size + FF_INPUT_BUFFER_PADDING_SIZE); | |
315 if (!st->codec->extradata) | |
316 return AVERROR(ENOMEM); | |
317 st->codec->extradata_size = size; | |
318 get_buffer(s->pb, st->codec->extradata, st->codec->extradata_size); | |
319 return 0; | |
320 } | |
321 | |
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
322 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
|
323 { |
4034 | 324 FLVContext *flv = s->priv_data; |
4005 | 325 int ret, i, type, size, flags, is_audio; |
326 int64_t next, pos; | |
4034 | 327 int64_t dts, pts = AV_NOPTS_VALUE; |
679 | 328 AVStream *st = NULL; |
885 | 329 |
445 | 330 for(;;){ |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2756
diff
changeset
|
331 pos = url_ftell(s->pb); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2756
diff
changeset
|
332 url_fskip(s->pb, 4); /* size of previous packet */ |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2756
diff
changeset
|
333 type = get_byte(s->pb); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2756
diff
changeset
|
334 size = get_be24(s->pb); |
3336 | 335 dts = get_be24(s->pb); |
336 dts |= get_byte(s->pb) << 24; | |
337 // 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
|
338 if (url_feof(s->pb)) |
4542
241a66d33f49
FLV demuxer: return AVERROR_EOF upon detection of end of file.
pross
parents:
4509
diff
changeset
|
339 return AVERROR_EOF; |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2756
diff
changeset
|
340 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
|
341 flags = 0; |
885 | 342 |
445 | 343 if(size == 0) |
344 continue; | |
885 | 345 |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2756
diff
changeset
|
346 next= size + url_ftell(s->pb); |
821 | 347 |
1553
504ceaa50e31
Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents:
1415
diff
changeset
|
348 if (type == FLV_TAG_TYPE_AUDIO) { |
445 | 349 is_audio=1; |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2756
diff
changeset
|
350 flags = get_byte(s->pb); |
3797 | 351 size--; |
1553
504ceaa50e31
Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents:
1415
diff
changeset
|
352 } else if (type == FLV_TAG_TYPE_VIDEO) { |
445 | 353 is_audio=0; |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2756
diff
changeset
|
354 flags = get_byte(s->pb); |
3797 | 355 size--; |
3798 | 356 if ((flags & 0xf0) == 0x50) /* video info / command frame */ |
357 goto skip; | |
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
358 } else { |
5096 | 359 if (type == FLV_TAG_TYPE_META && size > 13+1+4) |
1568 | 360 flv_read_metabody(s, next); |
361 else /* skip packet */ | |
5037
3550a49d6255
Downgrade message log level (from AV_LOG_ERROR to AV_LOG_DEBUG) about
stefano
parents:
4887
diff
changeset
|
362 av_log(s, AV_LOG_DEBUG, "skipping flv packet: type %d, size %d, flags %d\n", type, size, flags); |
3798 | 363 skip: |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2756
diff
changeset
|
364 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
|
365 continue; |
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
366 } |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
367 |
3799 | 368 /* skip empty data packets */ |
369 if (!size) | |
370 continue; | |
371 | |
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
372 /* now find stream */ |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
373 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
|
374 st = s->streams[i]; |
445 | 375 if (st->id == is_audio) |
376 break; | |
377 } | |
378 if(i == s->nb_streams){ | |
4509 | 379 av_log(s, AV_LOG_ERROR, "invalid stream\n"); |
2692 | 380 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
|
381 s->ctx_flags &= ~AVFMTCTX_NOHEADER; |
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
382 } |
4509 | 383 // 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
|
384 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
|
385 ||(st->discard >= AVDISCARD_BIDIR && ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_DISP_INTER && !is_audio)) |
708 | 386 || st->discard >= AVDISCARD_ALL |
387 ){ | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2756
diff
changeset
|
388 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
|
389 continue; |
652 | 390 } |
1553
504ceaa50e31
Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents:
1415
diff
changeset
|
391 if ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY) |
3336 | 392 av_add_index_entry(st, pos, dts, size, 0, AVINDEX_KEYFRAME); |
445 | 393 break; |
394 } | |
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
395 |
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
|
396 // 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
|
397 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
|
398 int size; |
4005 | 399 const int64_t pos= url_ftell(s->pb); |
400 const int64_t fsize= url_fsize(s->pb); | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2756
diff
changeset
|
401 url_fseek(s->pb, fsize-4, SEEK_SET); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2756
diff
changeset
|
402 size= get_be32(s->pb); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2756
diff
changeset
|
403 url_fseek(s->pb, fsize-3-size, SEEK_SET); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2756
diff
changeset
|
404 if(size == get_be24(s->pb) + 11){ |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2756
diff
changeset
|
405 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
|
406 } |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2756
diff
changeset
|
407 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
|
408 } |
bf3589ba8d7e
move duration finding code into read_packet() so it can be skiped if duration has already been set
michael
parents:
1562
diff
changeset
|
409 |
445 | 410 if(is_audio){ |
4125
df6989f6122b
Fix detection of audio codec in K70707-ARIA229.flv.
michael
parents:
4034
diff
changeset
|
411 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
|
412 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
|
413 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
|
414 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
|
415 } |
df6989f6122b
Fix detection of audio codec in K70707-ARIA229.flv.
michael
parents:
4034
diff
changeset
|
416 if(!st->codec->codec_id){ |
1568 | 417 flv_set_audio_codec(s, st, flags & FLV_AUDIO_CODECID_MASK); |
445 | 418 } |
419 }else{ | |
1568 | 420 size -= flv_set_video_codec(s, st, flags & FLV_VIDEO_CODECID_MASK); |
378 | 421 } |
422 | |
3364 | 423 if (st->codec->codec_id == CODEC_ID_AAC || |
424 st->codec->codec_id == CODEC_ID_H264) { | |
425 int type = get_byte(s->pb); | |
426 size--; | |
427 if (st->codec->codec_id == CODEC_ID_H264) { | |
4034 | 428 int32_t cts = (get_be24(s->pb)+0xff800000)^0xff800000; // sign extension |
429 pts = dts + cts; | |
430 if (cts < 0) { // dts are wrong | |
431 flv->wrong_dts = 1; | |
432 av_log(s, AV_LOG_WARNING, "negative cts, previous timestamps might be wrong\n"); | |
433 } | |
434 if (flv->wrong_dts) | |
435 dts = AV_NOPTS_VALUE; | |
3364 | 436 } |
437 if (type == 0) { | |
3797 | 438 if ((ret = flv_get_extradata(s, st, size)) < 0) |
3364 | 439 return ret; |
4559
ee5d7f52e4bc
parse aac extradata to fetch channels and sample rate, patch from Netgem
bcoudurier
parents:
4542
diff
changeset
|
440 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
|
441 MPEG4AudioConfig cfg; |
ee5d7f52e4bc
parse aac extradata to fetch channels and sample rate, patch from Netgem
bcoudurier
parents:
4542
diff
changeset
|
442 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
|
443 st->codec->extradata_size); |
ee5d7f52e4bc
parse aac extradata to fetch channels and sample rate, patch from Netgem
bcoudurier
parents:
4542
diff
changeset
|
444 if (cfg.chan_config > 7) |
ee5d7f52e4bc
parse aac extradata to fetch channels and sample rate, patch from Netgem
bcoudurier
parents:
4542
diff
changeset
|
445 return -1; |
ee5d7f52e4bc
parse aac extradata to fetch channels and sample rate, patch from Netgem
bcoudurier
parents:
4542
diff
changeset
|
446 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
|
447 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
|
448 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
|
449 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
|
450 } |
ee5d7f52e4bc
parse aac extradata to fetch channels and sample rate, patch from Netgem
bcoudurier
parents:
4542
diff
changeset
|
451 |
4271
f9ec55b30dfa
Use EAGAIN return, primarely intended as example of EAGAIN useage.
michael
parents:
4251
diff
changeset
|
452 return AVERROR(EAGAIN); |
3364 | 453 } |
454 } | |
455 | |
4805 | 456 /* skip empty data packets */ |
457 if (!size) | |
458 return AVERROR(EAGAIN); | |
459 | |
3797 | 460 ret= av_get_packet(s->pb, pkt, size); |
4811 | 461 if (ret < 0) { |
2274
b21c2af60bc9
Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents:
2273
diff
changeset
|
462 return AVERROR(EIO); |
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
463 } |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
464 /* 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
|
465 packet */ |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
466 pkt->size = ret; |
3336 | 467 pkt->dts = dts; |
4034 | 468 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
|
469 pkt->stream_index = st->index; |
885 | 470 |
1553
504ceaa50e31
Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents:
1415
diff
changeset
|
471 if (is_audio || ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY)) |
887 | 472 pkt->flags |= PKT_FLAG_KEY; |
885 | 473 |
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
474 return ret; |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
475 } |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
476 |
1167 | 477 AVInputFormat flv_demuxer = { |
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
478 "flv", |
3424
7a0230981402
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents:
3364
diff
changeset
|
479 NULL_IF_CONFIG_SMALL("FLV format"), |
4034 | 480 sizeof(FLVContext), |
164
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
481 flv_probe, |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
482 flv_read_header, |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
483 flv_read_packet, |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
484 .extensions = "flv", |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
485 .value = CODEC_ID_FLV1, |
99fbacf0f764
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff
changeset
|
486 }; |