annotate flvdec.c @ 5461:bb70b4771e0c libavformat

FLV 8-bit PCM is unsigned, not signed Fixes issue #1569
author daniel
date Mon, 14 Dec 2009 03:30:25 +0000
parents 4211f91f69b1
children 60e08f8038bd
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
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
608286f429a5 set pts in flv demuxer
bcoudurier
parents: 4013
diff changeset
33 typedef struct {
608286f429a5 set pts in flv demuxer
bcoudurier
parents: 4013
diff changeset
34 int wrong_dts; ///< wrong dts due to negative cts
608286f429a5 set pts in flv demuxer
bcoudurier
parents: 4013
diff changeset
35 } FLVContext;
608286f429a5 set pts in flv demuxer
bcoudurier
parents: 4013
diff changeset
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;
5193
360f4a07ce5e Check offset in flv_probe()
michael
parents: 5163
diff changeset
42 if (d[0] == 'F' && d[1] == 'L' && d[2] == 'V' && d[3] < 5 && d[5]==0 && AV_RB32(d+5)>8) {
1718
3eb35e92a29a improve probe and give it the max score
michael
parents: 1568
diff changeset
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
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
48 static void flv_set_audio_codec(AVFormatContext *s, AVStream *astream, int flv_codecid) {
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
49 AVCodecContext *acodec = astream->codec;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
50 switch(flv_codecid) {
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
51 //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
52 case FLV_CODECID_PCM:
5461
bb70b4771e0c FLV 8-bit PCM is unsigned, not signed
daniel
parents: 5446
diff changeset
53 acodec->codec_id = acodec->bits_per_coded_sample == 8 ? CODEC_ID_PCM_U8 :
5108
44a0fab134a9 Replace WORDS_BIGENDIAN with HAVE_BIGENDIAN
mru
parents: 5097
diff changeset
54 #if HAVE_BIGENDIAN
3062
9a56dcf7edfb Fix issue357
michael
parents: 3061
diff changeset
55 CODEC_ID_PCM_S16BE;
9a56dcf7edfb Fix issue357
michael
parents: 3061
diff changeset
56 #else
9a56dcf7edfb Fix issue357
michael
parents: 3061
diff changeset
57 CODEC_ID_PCM_S16LE;
9a56dcf7edfb Fix issue357
michael
parents: 3061
diff changeset
58 #endif
9a56dcf7edfb Fix issue357
michael
parents: 3061
diff changeset
59 break;
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
60 case FLV_CODECID_PCM_LE:
5461
bb70b4771e0c FLV 8-bit PCM is unsigned, not signed
daniel
parents: 5446
diff changeset
61 acodec->codec_id = acodec->bits_per_coded_sample == 8 ? CODEC_ID_PCM_U8 : CODEC_ID_PCM_S16LE; break;
3364
73da68338e64 aac and h264 in flv demuxing
bcoudurier
parents: 3336
diff changeset
62 case FLV_CODECID_AAC : acodec->codec_id = CODEC_ID_AAC; break;
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
63 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
64 case FLV_CODECID_SPEEX:
cf359952a1fc force sample rate to 16khz for speex in flv, fix speexaudio.flv
bcoudurier
parents: 4005
diff changeset
65 acodec->codec_id = CODEC_ID_SPEEX;
cf359952a1fc force sample rate to 16khz for speex in flv, fix speexaudio.flv
bcoudurier
parents: 4005
diff changeset
66 acodec->sample_rate = 16000;
cf359952a1fc force sample rate to 16khz for speex in flv, fix speexaudio.flv
bcoudurier
parents: 4005
diff changeset
67 break;
2023
a3e79d6e4e3c add an enum for need_parsing
aurel
parents: 2001
diff changeset
68 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
69 case FLV_CODECID_NELLYMOSER_8KHZ_MONO:
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
70 acodec->sample_rate = 8000; //in case metadata does not otherwise declare samplerate
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
71 case FLV_CODECID_NELLYMOSER:
2604
cb5f9ba6b63b Nellymoser ASAO decoder
banan
parents: 2572
diff changeset
72 acodec->codec_id = CODEC_ID_NELLYMOSER;
cb5f9ba6b63b Nellymoser ASAO decoder
banan
parents: 2572
diff changeset
73 break;
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
74 default:
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
75 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
76 acodec->codec_tag = flv_codecid >> FLV_AUDIO_CODECID_OFFSET;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
77 }
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
78 }
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
79
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
80 static int flv_set_video_codec(AVFormatContext *s, AVStream *vstream, int flv_codecid) {
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
81 AVCodecContext *vcodec = vstream->codec;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
82 switch(flv_codecid) {
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
83 case FLV_CODECID_H263 : vcodec->codec_id = CODEC_ID_FLV1 ; break;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
84 case FLV_CODECID_SCREEN: vcodec->codec_id = CODEC_ID_FLASHSV; break;
5372
58056ca84fb1 Add codec id for Flash screen codec v2 and hook it up in FLV demuxer
daniel
parents: 5362
diff changeset
85 case FLV_CODECID_SCREEN2: vcodec->codec_id = CODEC_ID_FLASHSV2; break;
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
86 case FLV_CODECID_VP6 : vcodec->codec_id = CODEC_ID_VP6F ;
2572
aabd822b5db5 use the VP6A codec
aurel
parents: 2571
diff changeset
87 case FLV_CODECID_VP6A :
aabd822b5db5 use the VP6A codec
aurel
parents: 2571
diff changeset
88 if(flv_codecid == FLV_CODECID_VP6A)
aabd822b5db5 use the VP6A codec
aurel
parents: 2571
diff changeset
89 vcodec->codec_id = CODEC_ID_VP6A;
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
90 if(vcodec->extradata_size != 1) {
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
91 vcodec->extradata_size = 1;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
92 vcodec->extradata = av_malloc(1);
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
93 }
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
94 vcodec->extradata[0] = get_byte(s->pb);
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
95 return 1; // 1 byte body size adjustment for flv_read_packet()
3364
73da68338e64 aac and h264 in flv demuxing
bcoudurier
parents: 3336
diff changeset
96 case FLV_CODECID_H264:
73da68338e64 aac and h264 in flv demuxing
bcoudurier
parents: 3336
diff changeset
97 vcodec->codec_id = CODEC_ID_H264;
73da68338e64 aac and h264 in flv demuxing
bcoudurier
parents: 3336
diff changeset
98 return 3; // not 4, reading packet type will consume one byte
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
99 default:
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
100 av_log(s, AV_LOG_INFO, "Unsupported video codec (%x)\n", flv_codecid);
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
101 vcodec->codec_tag = flv_codecid;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
102 }
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
103
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
104 return 0;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
105 }
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
106
5446
4211f91f69b1 Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents: 5372
diff changeset
107 static int amf_get_string(ByteIOContext *ioc, char **buf)
4211f91f69b1 Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents: 5372
diff changeset
108 {
4211f91f69b1 Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents: 5372
diff changeset
109 uint16_t len = get_be16(ioc);
1560
f59b66f9d679 amf_get_string() by Allan Hsu allan aat counterpop doot net
michael
parents: 1559
diff changeset
110
5446
4211f91f69b1 Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents: 5372
diff changeset
111 *buf = av_malloc(len+1);
4211f91f69b1 Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents: 5372
diff changeset
112 if (!*buf)
4211f91f69b1 Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents: 5372
diff changeset
113 return AVERROR_NOMEM;
1560
f59b66f9d679 amf_get_string() by Allan Hsu allan aat counterpop doot net
michael
parents: 1559
diff changeset
114
5446
4211f91f69b1 Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents: 5372
diff changeset
115 get_buffer(ioc, *buf, len);
4211f91f69b1 Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents: 5372
diff changeset
116 (*buf)[len] = '\0';
1560
f59b66f9d679 amf_get_string() by Allan Hsu allan aat counterpop doot net
michael
parents: 1559
diff changeset
117
5446
4211f91f69b1 Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents: 5372
diff changeset
118 return len;
1560
f59b66f9d679 amf_get_string() by Allan Hsu allan aat counterpop doot net
michael
parents: 1559
diff changeset
119 }
f59b66f9d679 amf_get_string() by Allan Hsu allan aat counterpop doot net
michael
parents: 1559
diff changeset
120
4005
476a5d7182db fix for >2GB flv files
skal
parents: 3996
diff changeset
121 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
122 AVCodecContext *acodec, *vcodec;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
123 ByteIOContext *ioc;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
124 AMFDataType amf_type;
5446
4211f91f69b1 Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents: 5372
diff changeset
125 char *str = NULL;
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
126 double num_val;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
127
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
128 num_val = 0;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
129 ioc = s->pb;
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
130
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
131 amf_type = get_byte(ioc);
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
132
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
133 switch(amf_type) {
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
134 case AMF_DATA_TYPE_NUMBER:
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
135 num_val = av_int2dbl(get_be64(ioc)); break;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
136 case AMF_DATA_TYPE_BOOL:
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
137 num_val = get_byte(ioc); break;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
138 case AMF_DATA_TYPE_STRING:
5446
4211f91f69b1 Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents: 5372
diff changeset
139 if(amf_get_string(ioc, &str) < 0)
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
140 return -1;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
141 break;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
142 case AMF_DATA_TYPE_OBJECT: {
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
143 unsigned int keylen;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
144
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
145 while(url_ftell(ioc) < max_pos - 2 && (keylen = get_be16(ioc))) {
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
146 url_fskip(ioc, keylen); //skip key string
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
147 if(amf_parse_object(s, NULL, NULL, NULL, max_pos, depth + 1) < 0)
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
148 return -1; //if we couldn't skip, bomb out.
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
149 }
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
150 if(get_byte(ioc) != AMF_END_OF_OBJECT)
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
151 return -1;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
152 }
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
153 break;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
154 case AMF_DATA_TYPE_NULL:
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
155 case AMF_DATA_TYPE_UNDEFINED:
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
156 case AMF_DATA_TYPE_UNSUPPORTED:
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
157 break; //these take up no additional space
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
158 case AMF_DATA_TYPE_MIXEDARRAY:
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
159 url_fskip(ioc, 4); //skip 32-bit max array index
5446
4211f91f69b1 Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents: 5372
diff changeset
160 while(url_ftell(ioc) < max_pos - 2 && amf_get_string(ioc, &str) > 0) {
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
161 //this is the only case in which we would want a nested parse to not skip over the object
5446
4211f91f69b1 Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents: 5372
diff changeset
162 if(amf_parse_object(s, astream, vstream, str, max_pos, depth + 1) < 0)
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
163 return -1;
5446
4211f91f69b1 Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents: 5372
diff changeset
164 av_freep(&str);
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
165 }
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
166 if(get_byte(ioc) != AMF_END_OF_OBJECT)
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
167 return -1;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
168 break;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
169 case AMF_DATA_TYPE_ARRAY: {
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
170 unsigned int arraylen, i;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
171
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
172 arraylen = get_be32(ioc);
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
173 for(i = 0; i < arraylen && url_ftell(ioc) < max_pos - 1; i++) {
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
174 if(amf_parse_object(s, NULL, NULL, NULL, max_pos, depth + 1) < 0)
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
175 return -1; //if we couldn't skip, bomb out.
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
176 }
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
177 }
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
178 break;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
179 case AMF_DATA_TYPE_DATE:
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
180 url_fskip(ioc, 8 + 2); //timestamp (double) and UTC offset (int16)
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
181 break;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
182 default: //unsupported type, we couldn't skip
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
183 return -1;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
184 }
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(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
187 acodec = astream ? astream->codec : NULL;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
188 vcodec = vstream ? vstream->codec : NULL;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
189
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
190 if(amf_type == AMF_DATA_TYPE_BOOL) {
5446
4211f91f69b1 Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents: 5372
diff changeset
191 av_metadata_set2(&s->metadata, key, av_d2str(num_val), AV_METADATA_DONT_STRDUP_VAL);
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
192 } else if(amf_type == AMF_DATA_TYPE_NUMBER) {
5446
4211f91f69b1 Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents: 5372
diff changeset
193 av_metadata_set2(&s->metadata, key, av_d2str(num_val), AV_METADATA_DONT_STRDUP_VAL);
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
194 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
195 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
196 vcodec->bit_rate = num_val * 1024.0;
5097
453175c733c4 flvdec: expose metadata through the generic metadata API
aurel
parents: 5096
diff changeset
197 } else if (amf_type == AMF_DATA_TYPE_STRING)
5446
4211f91f69b1 Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents: 5372
diff changeset
198 av_metadata_set2(&s->metadata, key, str,
4211f91f69b1 Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents: 5372
diff changeset
199 AV_METADATA_DONT_STRDUP_VAL);
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
200 }
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
201
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
202 return 0;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
203 }
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
204
4005
476a5d7182db fix for >2GB flv files
skal
parents: 3996
diff changeset
205 static int flv_read_metabody(AVFormatContext *s, int64_t next_pos) {
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
206 AMFDataType type;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
207 AVStream *stream, *astream, *vstream;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
208 ByteIOContext *ioc;
4887
acb51f192e13 Remove unused variable from flv_read_metabody() found by CSA.
michael
parents: 4863
diff changeset
209 int i;
5446
4211f91f69b1 Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents: 5372
diff changeset
210 char *buf = NULL; //only needs to hold the string "onMetaData". Anything longer is something we don't want.
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
211
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
212 astream = NULL;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
213 vstream = NULL;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
214 ioc = s->pb;
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 //first object needs to be "onMetaData" string
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
217 type = get_byte(ioc);
5446
4211f91f69b1 Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents: 5372
diff changeset
218 if (type != AMF_DATA_TYPE_STRING ||
4211f91f69b1 Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents: 5372
diff changeset
219 amf_get_string(ioc, &buf) < 0 || strcmp(buf, "onMetaData")) {
4211f91f69b1 Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents: 5372
diff changeset
220 av_freep(&buf);
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
221 return -1;
5446
4211f91f69b1 Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents: 5372
diff changeset
222 }
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
223
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
224 //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
225 for(i = 0; i < s->nb_streams; i++) {
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
226 stream = s->streams[i];
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
227 if (stream->codec->codec_type == CODEC_TYPE_AUDIO) astream = stream;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
228 else if(stream->codec->codec_type == CODEC_TYPE_VIDEO) vstream = stream;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
229 }
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
230
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
231 //parse the second object (we want a mixed array)
5446
4211f91f69b1 Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents: 5372
diff changeset
232 if(amf_parse_object(s, astream, vstream, buf, next_pos, 0) < 0)
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
233 return -1;
5446
4211f91f69b1 Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents: 5372
diff changeset
234 av_freep(&buf);
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
235
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
236 return 0;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
237 }
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
238
2691
002ab6bbf9db factorize stream creation
michael
parents: 2604
diff changeset
239 static AVStream *create_stream(AVFormatContext *s, int is_audio){
002ab6bbf9db factorize stream creation
michael
parents: 2604
diff changeset
240 AVStream *st = av_new_stream(s, is_audio);
002ab6bbf9db factorize stream creation
michael
parents: 2604
diff changeset
241 if (!st)
002ab6bbf9db factorize stream creation
michael
parents: 2604
diff changeset
242 return NULL;
002ab6bbf9db factorize stream creation
michael
parents: 2604
diff changeset
243 st->codec->codec_type = is_audio ? CODEC_TYPE_AUDIO : CODEC_TYPE_VIDEO;
3335
efed46e8afb3 flv use 32 bit pts
bcoudurier
parents: 3251
diff changeset
244 av_set_pts_info(st, 32, 1, 1000); /* 32 bit pts in ms */
2691
002ab6bbf9db factorize stream creation
michael
parents: 2604
diff changeset
245 return st;
002ab6bbf9db factorize stream creation
michael
parents: 2604
diff changeset
246 }
002ab6bbf9db factorize stream creation
michael
parents: 2604
diff changeset
247
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
248 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
249 AVFormatParameters *ap)
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
250 {
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
251 int offset, flags;
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
252
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
253 url_fskip(s->pb, 4);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
254 flags = get_byte(s->pb);
1886
cf8db4fe9efa workaround for broken flvtoolized files
alex
parents: 1719
diff changeset
255 /* old flvtool cleared this field */
cf8db4fe9efa workaround for broken flvtoolized files
alex
parents: 1719
diff changeset
256 /* FIXME: better fix needed */
cf8db4fe9efa workaround for broken flvtoolized files
alex
parents: 1719
diff changeset
257 if (!flags) {
cf8db4fe9efa workaround for broken flvtoolized files
alex
parents: 1719
diff changeset
258 flags = FLV_HEADER_FLAG_HASVIDEO | FLV_HEADER_FLAG_HASAUDIO;
cf8db4fe9efa workaround for broken flvtoolized files
alex
parents: 1719
diff changeset
259 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
260 }
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
261
3218
d5b42f345638 Recommit r12809
michael
parents: 3217
diff changeset
262 if((flags & (FLV_HEADER_FLAG_HASVIDEO|FLV_HEADER_FLAG_HASAUDIO))
d5b42f345638 Recommit r12809
michael
parents: 3217
diff changeset
263 != (FLV_HEADER_FLAG_HASVIDEO|FLV_HEADER_FLAG_HASAUDIO))
d5b42f345638 Recommit r12809
michael
parents: 3217
diff changeset
264 s->ctx_flags |= AVFMTCTX_NOHEADER;
d5b42f345638 Recommit r12809
michael
parents: 3217
diff changeset
265
1559
515e80ef01e6 get rid of AVFMTCTX_NOHEADER, create streams in read_header()
michael
parents: 1553
diff changeset
266 if(flags & FLV_HEADER_FLAG_HASVIDEO){
2691
002ab6bbf9db factorize stream creation
michael
parents: 2604
diff changeset
267 if(!create_stream(s, 0))
2273
7eb456c4ed8a Replace all occurrences of AVERROR_NOMEM with AVERROR(ENOMEM).
takis
parents: 2216
diff changeset
268 return AVERROR(ENOMEM);
1559
515e80ef01e6 get rid of AVFMTCTX_NOHEADER, create streams in read_header()
michael
parents: 1553
diff changeset
269 }
515e80ef01e6 get rid of AVFMTCTX_NOHEADER, create streams in read_header()
michael
parents: 1553
diff changeset
270 if(flags & FLV_HEADER_FLAG_HASAUDIO){
2691
002ab6bbf9db factorize stream creation
michael
parents: 2604
diff changeset
271 if(!create_stream(s, 1))
2273
7eb456c4ed8a Replace all occurrences of AVERROR_NOMEM with AVERROR(ENOMEM).
takis
parents: 2216
diff changeset
272 return AVERROR(ENOMEM);
1559
515e80ef01e6 get rid of AVFMTCTX_NOHEADER, create streams in read_header()
michael
parents: 1553
diff changeset
273 }
515e80ef01e6 get rid of AVFMTCTX_NOHEADER, create streams in read_header()
michael
parents: 1553
diff changeset
274
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
275 offset = get_be32(s->pb);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
276 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
277
1318
defa841523a9 FLV seeking patch by Nazo. lovesyao at aol com.
banan
parents: 1305
diff changeset
278 s->start_time = 0;
defa841523a9 FLV seeking patch by Nazo. lovesyao at aol com.
banan
parents: 1305
diff changeset
279
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
280 return 0;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
281 }
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
282
3364
73da68338e64 aac and h264 in flv demuxing
bcoudurier
parents: 3336
diff changeset
283 static int flv_get_extradata(AVFormatContext *s, AVStream *st, int size)
73da68338e64 aac and h264 in flv demuxing
bcoudurier
parents: 3336
diff changeset
284 {
73da68338e64 aac and h264 in flv demuxing
bcoudurier
parents: 3336
diff changeset
285 av_free(st->codec->extradata);
73da68338e64 aac and h264 in flv demuxing
bcoudurier
parents: 3336
diff changeset
286 st->codec->extradata = av_mallocz(size + FF_INPUT_BUFFER_PADDING_SIZE);
73da68338e64 aac and h264 in flv demuxing
bcoudurier
parents: 3336
diff changeset
287 if (!st->codec->extradata)
73da68338e64 aac and h264 in flv demuxing
bcoudurier
parents: 3336
diff changeset
288 return AVERROR(ENOMEM);
73da68338e64 aac and h264 in flv demuxing
bcoudurier
parents: 3336
diff changeset
289 st->codec->extradata_size = size;
73da68338e64 aac and h264 in flv demuxing
bcoudurier
parents: 3336
diff changeset
290 get_buffer(s->pb, st->codec->extradata, st->codec->extradata_size);
73da68338e64 aac and h264 in flv demuxing
bcoudurier
parents: 3336
diff changeset
291 return 0;
73da68338e64 aac and h264 in flv demuxing
bcoudurier
parents: 3336
diff changeset
292 }
73da68338e64 aac and h264 in flv demuxing
bcoudurier
parents: 3336
diff changeset
293
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
294 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
295 {
4034
608286f429a5 set pts in flv demuxer
bcoudurier
parents: 4013
diff changeset
296 FLVContext *flv = s->priv_data;
4005
476a5d7182db fix for >2GB flv files
skal
parents: 3996
diff changeset
297 int ret, i, type, size, flags, is_audio;
476a5d7182db fix for >2GB flv files
skal
parents: 3996
diff changeset
298 int64_t next, pos;
4034
608286f429a5 set pts in flv demuxer
bcoudurier
parents: 4013
diff changeset
299 int64_t dts, pts = AV_NOPTS_VALUE;
679
54d87ed9b3e4 correct pcm in flv handling
alex
parents: 652
diff changeset
300 AVStream *st = NULL;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 822
diff changeset
301
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
302 for(;;){
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
303 pos = url_ftell(s->pb);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
304 url_fskip(s->pb, 4); /* size of previous packet */
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
305 type = get_byte(s->pb);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
306 size = get_be24(s->pb);
3336
664637a9867b in flv this field is dts finally
bcoudurier
parents: 3335
diff changeset
307 dts = get_be24(s->pb);
664637a9867b in flv this field is dts finally
bcoudurier
parents: 3335
diff changeset
308 dts |= get_byte(s->pb) << 24;
664637a9867b in flv this field is dts finally
bcoudurier
parents: 3335
diff changeset
309 // 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
310 if (url_feof(s->pb))
4542
241a66d33f49 FLV demuxer: return AVERROR_EOF upon detection of end of file.
pross
parents: 4509
diff changeset
311 return AVERROR_EOF;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
312 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
313 flags = 0;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 822
diff changeset
314
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
315 if(size == 0)
c1f88671135b cleanup
michael
parents: 378
diff changeset
316 continue;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 822
diff changeset
317
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
318 next= size + url_ftell(s->pb);
821
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
319
1553
504ceaa50e31 Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents: 1415
diff changeset
320 if (type == FLV_TAG_TYPE_AUDIO) {
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
321 is_audio=1;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
322 flags = get_byte(s->pb);
3797
5fc16ca7b356 simplify size handling code
bcoudurier
parents: 3795
diff changeset
323 size--;
1553
504ceaa50e31 Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents: 1415
diff changeset
324 } else if (type == FLV_TAG_TYPE_VIDEO) {
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
325 is_audio=0;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
326 flags = get_byte(s->pb);
3797
5fc16ca7b356 simplify size handling code
bcoudurier
parents: 3795
diff changeset
327 size--;
3798
181ce3b7ca8b factorize packet skip code
bcoudurier
parents: 3797
diff changeset
328 if ((flags & 0xf0) == 0x50) /* video info / command frame */
181ce3b7ca8b factorize packet skip code
bcoudurier
parents: 3797
diff changeset
329 goto skip;
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
330 } else {
5096
7edb10e8f03b flvdec: re-enable metadata parsing
aurel
parents: 5095
diff changeset
331 if (type == FLV_TAG_TYPE_META && size > 13+1+4)
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
332 flv_read_metabody(s, next);
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
333 else /* skip packet */
5037
3550a49d6255 Downgrade message log level (from AV_LOG_ERROR to AV_LOG_DEBUG) about
stefano
parents: 4887
diff changeset
334 av_log(s, AV_LOG_DEBUG, "skipping flv packet: type %d, size %d, flags %d\n", type, size, flags);
3798
181ce3b7ca8b factorize packet skip code
bcoudurier
parents: 3797
diff changeset
335 skip:
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
336 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
337 continue;
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
338 }
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
339
3799
2f2fbec96aeb skip empty flv data packets, fix issue #602
bcoudurier
parents: 3798
diff changeset
340 /* skip empty data packets */
2f2fbec96aeb skip empty flv data packets, fix issue #602
bcoudurier
parents: 3798
diff changeset
341 if (!size)
2f2fbec96aeb skip empty flv data packets, fix issue #602
bcoudurier
parents: 3798
diff changeset
342 continue;
2f2fbec96aeb skip empty flv data packets, fix issue #602
bcoudurier
parents: 3798
diff changeset
343
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
344 /* now find stream */
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
345 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
346 st = s->streams[i];
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
347 if (st->id == is_audio)
c1f88671135b cleanup
michael
parents: 378
diff changeset
348 break;
c1f88671135b cleanup
michael
parents: 378
diff changeset
349 }
c1f88671135b cleanup
michael
parents: 378
diff changeset
350 if(i == s->nb_streams){
4509
8ec95cf6deb9 Add a context to av_log() calls.
benoit
parents: 4347
diff changeset
351 av_log(s, AV_LOG_ERROR, "invalid stream\n");
2692
d320b2990d7e support flv with invalid header
michael
parents: 2691
diff changeset
352 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
353 s->ctx_flags &= ~AVFMTCTX_NOHEADER;
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
354 }
4509
8ec95cf6deb9 Add a context to av_log() calls.
benoit
parents: 4347
diff changeset
355 // 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
356 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
357 ||(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
358 || st->discard >= AVDISCARD_ALL
d79164865a7c more fine grained discarding of packets
michael
parents: 684
diff changeset
359 ){
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
360 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
361 continue;
652
b47948262721 support discarding uninterresting packets
michael
parents: 620
diff changeset
362 }
1553
504ceaa50e31 Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents: 1415
diff changeset
363 if ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY)
3336
664637a9867b in flv this field is dts finally
bcoudurier
parents: 3335
diff changeset
364 av_add_index_entry(st, pos, dts, size, 0, AVINDEX_KEYFRAME);
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
365 break;
c1f88671135b cleanup
michael
parents: 378
diff changeset
366 }
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
367
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
368 // 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
369 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
370 int size;
4005
476a5d7182db fix for >2GB flv files
skal
parents: 3996
diff changeset
371 const int64_t pos= url_ftell(s->pb);
476a5d7182db fix for >2GB flv files
skal
parents: 3996
diff changeset
372 const int64_t fsize= url_fsize(s->pb);
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
373 url_fseek(s->pb, fsize-4, SEEK_SET);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
374 size= get_be32(s->pb);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
375 url_fseek(s->pb, fsize-3-size, SEEK_SET);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
376 if(size == get_be24(s->pb) + 11){
5163
01514407ab35 Use all 32 bits of the timestamp when calculating flv duration.
diego
parents: 5155
diff changeset
377 uint32_t ts = get_be24(s->pb);
01514407ab35 Use all 32 bits of the timestamp when calculating flv duration.
diego
parents: 5155
diff changeset
378 ts |= get_byte(s->pb) << 24;
01514407ab35 Use all 32 bits of the timestamp when calculating flv duration.
diego
parents: 5155
diff changeset
379 s->duration = ts * (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
380 }
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
381 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
382 }
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
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
384 if(is_audio){
4125
df6989f6122b Fix detection of audio codec in K70707-ARIA229.flv.
michael
parents: 4034
diff changeset
385 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
386 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
387 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
388 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
389 }
df6989f6122b Fix detection of audio codec in K70707-ARIA229.flv.
michael
parents: 4034
diff changeset
390 if(!st->codec->codec_id){
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
391 flv_set_audio_codec(s, st, flags & FLV_AUDIO_CODECID_MASK);
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
392 }
c1f88671135b cleanup
michael
parents: 378
diff changeset
393 }else{
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
394 size -= flv_set_video_codec(s, st, flags & FLV_VIDEO_CODECID_MASK);
378
abd83fc30f0e guess framerate
michael
parents: 376
diff changeset
395 }
abd83fc30f0e guess framerate
michael
parents: 376
diff changeset
396
3364
73da68338e64 aac and h264 in flv demuxing
bcoudurier
parents: 3336
diff changeset
397 if (st->codec->codec_id == CODEC_ID_AAC ||
73da68338e64 aac and h264 in flv demuxing
bcoudurier
parents: 3336
diff changeset
398 st->codec->codec_id == CODEC_ID_H264) {
73da68338e64 aac and h264 in flv demuxing
bcoudurier
parents: 3336
diff changeset
399 int type = get_byte(s->pb);
73da68338e64 aac and h264 in flv demuxing
bcoudurier
parents: 3336
diff changeset
400 size--;
73da68338e64 aac and h264 in flv demuxing
bcoudurier
parents: 3336
diff changeset
401 if (st->codec->codec_id == CODEC_ID_H264) {
4034
608286f429a5 set pts in flv demuxer
bcoudurier
parents: 4013
diff changeset
402 int32_t cts = (get_be24(s->pb)+0xff800000)^0xff800000; // sign extension
608286f429a5 set pts in flv demuxer
bcoudurier
parents: 4013
diff changeset
403 pts = dts + cts;
608286f429a5 set pts in flv demuxer
bcoudurier
parents: 4013
diff changeset
404 if (cts < 0) { // dts are wrong
608286f429a5 set pts in flv demuxer
bcoudurier
parents: 4013
diff changeset
405 flv->wrong_dts = 1;
608286f429a5 set pts in flv demuxer
bcoudurier
parents: 4013
diff changeset
406 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
407 }
608286f429a5 set pts in flv demuxer
bcoudurier
parents: 4013
diff changeset
408 if (flv->wrong_dts)
608286f429a5 set pts in flv demuxer
bcoudurier
parents: 4013
diff changeset
409 dts = AV_NOPTS_VALUE;
3364
73da68338e64 aac and h264 in flv demuxing
bcoudurier
parents: 3336
diff changeset
410 }
73da68338e64 aac and h264 in flv demuxing
bcoudurier
parents: 3336
diff changeset
411 if (type == 0) {
3797
5fc16ca7b356 simplify size handling code
bcoudurier
parents: 3795
diff changeset
412 if ((ret = flv_get_extradata(s, st, size)) < 0)
3364
73da68338e64 aac and h264 in flv demuxing
bcoudurier
parents: 3336
diff changeset
413 return ret;
4559
ee5d7f52e4bc parse aac extradata to fetch channels and sample rate, patch from Netgem
bcoudurier
parents: 4542
diff changeset
414 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
415 MPEG4AudioConfig cfg;
ee5d7f52e4bc parse aac extradata to fetch channels and sample rate, patch from Netgem
bcoudurier
parents: 4542
diff changeset
416 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
417 st->codec->extradata_size);
5362
6f5a1064e48a Add a channels field to MPEG4AudioConfig.
alexc
parents: 5193
diff changeset
418 st->codec->channels = cfg.channels;
4559
ee5d7f52e4bc parse aac extradata to fetch channels and sample rate, patch from Netgem
bcoudurier
parents: 4542
diff changeset
419 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
420 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
421 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
422 }
ee5d7f52e4bc parse aac extradata to fetch channels and sample rate, patch from Netgem
bcoudurier
parents: 4542
diff changeset
423
4271
f9ec55b30dfa Use EAGAIN return, primarely intended as example of EAGAIN useage.
michael
parents: 4251
diff changeset
424 return AVERROR(EAGAIN);
3364
73da68338e64 aac and h264 in flv demuxing
bcoudurier
parents: 3336
diff changeset
425 }
73da68338e64 aac and h264 in flv demuxing
bcoudurier
parents: 3336
diff changeset
426 }
73da68338e64 aac and h264 in flv demuxing
bcoudurier
parents: 3336
diff changeset
427
4805
063522a177cc skip empty data packets in flv, fix input.flv
bcoudurier
parents: 4643
diff changeset
428 /* skip empty data packets */
063522a177cc skip empty data packets in flv, fix input.flv
bcoudurier
parents: 4643
diff changeset
429 if (!size)
063522a177cc skip empty data packets in flv, fix input.flv
bcoudurier
parents: 4643
diff changeset
430 return AVERROR(EAGAIN);
063522a177cc skip empty data packets in flv, fix input.flv
bcoudurier
parents: 4643
diff changeset
431
3797
5fc16ca7b356 simplify size handling code
bcoudurier
parents: 3795
diff changeset
432 ret= av_get_packet(s->pb, pkt, size);
4811
ef366aa6b7f2 Do not fail on zero packets.
michael
parents: 4805
diff changeset
433 if (ret < 0) {
2274
b21c2af60bc9 Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents: 2273
diff changeset
434 return AVERROR(EIO);
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
435 }
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
436 /* 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
437 packet */
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
438 pkt->size = ret;
3336
664637a9867b in flv this field is dts finally
bcoudurier
parents: 3335
diff changeset
439 pkt->dts = dts;
4034
608286f429a5 set pts in flv demuxer
bcoudurier
parents: 4013
diff changeset
440 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
441 pkt->stream_index = st->index;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 822
diff changeset
442
1553
504ceaa50e31 Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents: 1415
diff changeset
443 if (is_audio || ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY))
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
444 pkt->flags |= PKT_FLAG_KEY;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 822
diff changeset
445
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
446 return ret;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
447 }
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
448
1167
d89d7ef290da give AVInput/OutputFormat structs consistent names
mru
parents: 1101
diff changeset
449 AVInputFormat flv_demuxer = {
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
450 "flv",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3364
diff changeset
451 NULL_IF_CONFIG_SMALL("FLV format"),
4034
608286f429a5 set pts in flv demuxer
bcoudurier
parents: 4013
diff changeset
452 sizeof(FLVContext),
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
453 flv_probe,
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
454 flv_read_header,
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
455 flv_read_packet,
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
456 .extensions = "flv",
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
457 .value = CODEC_ID_FLV1,
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
458 };