annotate flvdec.c @ 2847:f2a69a8c657d libavformat

Correctly handle FLV_CODECID_NELLYMOSER_8HZ_MONO files
author banan
date Thu, 20 Dec 2007 11:21:10 +0000
parents d52c718e83f9
children c8185d08d339
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
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
3 * Copyright (c) 2003 The FFmpeg Project.
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 */
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
26 #include "avformat.h"
1553
504ceaa50e31 Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents: 1415
diff changeset
27 #include "flv.h"
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
28
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
29 static int flv_probe(AVProbeData *p)
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
30 {
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
31 const uint8_t *d;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
32
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
33 d = p->buf;
1718
3eb35e92a29a improve probe and give it the max score
michael
parents: 1568
diff changeset
34 if (d[0] == 'F' && d[1] == 'L' && d[2] == 'V' && d[3] < 5 && d[5]==0) {
3eb35e92a29a improve probe and give it the max score
michael
parents: 1568
diff changeset
35 return AVPROBE_SCORE_MAX;
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
36 }
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
37 return 0;
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
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
40 static void flv_set_audio_codec(AVFormatContext *s, AVStream *astream, int flv_codecid) {
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
41 AVCodecContext *acodec = astream->codec;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
42 switch(flv_codecid) {
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
43 //no distinction between S16 and S8 PCM codec flags
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
44 case FLV_CODECID_PCM_BE:
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
45 acodec->codec_id = acodec->bits_per_sample == 8 ? CODEC_ID_PCM_S8 : CODEC_ID_PCM_S16BE; break;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
46 case FLV_CODECID_PCM_LE:
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
47 acodec->codec_id = acodec->bits_per_sample == 8 ? CODEC_ID_PCM_S8 : CODEC_ID_PCM_S16LE; break;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
48 case FLV_CODECID_ADPCM: acodec->codec_id = CODEC_ID_ADPCM_SWF; break;
2023
a3e79d6e4e3c add an enum for need_parsing
aurel
parents: 2001
diff changeset
49 case FLV_CODECID_MP3 : acodec->codec_id = CODEC_ID_MP3 ; astream->need_parsing = AVSTREAM_PARSE_FULL; break;
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
50 case FLV_CODECID_NELLYMOSER_8HZ_MONO:
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
51 acodec->sample_rate = 8000; //in case metadata does not otherwise declare samplerate
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
52 case FLV_CODECID_NELLYMOSER:
2604
cb5f9ba6b63b Nellymoser ASAO decoder
banan
parents: 2572
diff changeset
53 acodec->codec_id = CODEC_ID_NELLYMOSER;
cb5f9ba6b63b Nellymoser ASAO decoder
banan
parents: 2572
diff changeset
54 break;
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
55 default:
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
56 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
57 acodec->codec_tag = flv_codecid >> FLV_AUDIO_CODECID_OFFSET;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
58 }
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
59 }
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
60
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
61 static int flv_set_video_codec(AVFormatContext *s, AVStream *vstream, int flv_codecid) {
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
62 AVCodecContext *vcodec = vstream->codec;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
63 switch(flv_codecid) {
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
64 case FLV_CODECID_H263 : vcodec->codec_id = CODEC_ID_FLV1 ; break;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
65 case FLV_CODECID_SCREEN: vcodec->codec_id = CODEC_ID_FLASHSV; break;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
66 case FLV_CODECID_VP6 : vcodec->codec_id = CODEC_ID_VP6F ;
2572
aabd822b5db5 use the VP6A codec
aurel
parents: 2571
diff changeset
67 case FLV_CODECID_VP6A :
aabd822b5db5 use the VP6A codec
aurel
parents: 2571
diff changeset
68 if(flv_codecid == FLV_CODECID_VP6A)
aabd822b5db5 use the VP6A codec
aurel
parents: 2571
diff changeset
69 vcodec->codec_id = CODEC_ID_VP6A;
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
70 if(vcodec->extradata_size != 1) {
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
71 vcodec->extradata_size = 1;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
72 vcodec->extradata = av_malloc(1);
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
73 }
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
74 vcodec->extradata[0] = get_byte(s->pb);
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
75 return 1; // 1 byte body size adjustment for flv_read_packet()
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
76 default:
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
77 av_log(s, AV_LOG_INFO, "Unsupported video codec (%x)\n", flv_codecid);
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
78 vcodec->codec_tag = flv_codecid;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
79 }
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
80
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
81 return 0;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
82 }
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
83
1560
f59b66f9d679 amf_get_string() by Allan Hsu allan aat counterpop doot net
michael
parents: 1559
diff changeset
84 static int amf_get_string(ByteIOContext *ioc, char *buffer, int buffsize) {
1561
a21addc40d10 cosmetics
michael
parents: 1560
diff changeset
85 int length = get_be16(ioc);
1560
f59b66f9d679 amf_get_string() by Allan Hsu allan aat counterpop doot net
michael
parents: 1559
diff changeset
86 if(length >= buffsize) {
f59b66f9d679 amf_get_string() by Allan Hsu allan aat counterpop doot net
michael
parents: 1559
diff changeset
87 url_fskip(ioc, length);
1561
a21addc40d10 cosmetics
michael
parents: 1560
diff changeset
88 return -1;
1560
f59b66f9d679 amf_get_string() by Allan Hsu allan aat counterpop doot net
michael
parents: 1559
diff changeset
89 }
f59b66f9d679 amf_get_string() by Allan Hsu allan aat counterpop doot net
michael
parents: 1559
diff changeset
90
f59b66f9d679 amf_get_string() by Allan Hsu allan aat counterpop doot net
michael
parents: 1559
diff changeset
91 get_buffer(ioc, buffer, length);
f59b66f9d679 amf_get_string() by Allan Hsu allan aat counterpop doot net
michael
parents: 1559
diff changeset
92
f59b66f9d679 amf_get_string() by Allan Hsu allan aat counterpop doot net
michael
parents: 1559
diff changeset
93 buffer[length] = '\0';
f59b66f9d679 amf_get_string() by Allan Hsu allan aat counterpop doot net
michael
parents: 1559
diff changeset
94
f59b66f9d679 amf_get_string() by Allan Hsu allan aat counterpop doot net
michael
parents: 1559
diff changeset
95 return length;
f59b66f9d679 amf_get_string() by Allan Hsu allan aat counterpop doot net
michael
parents: 1559
diff changeset
96 }
f59b66f9d679 amf_get_string() by Allan Hsu allan aat counterpop doot net
michael
parents: 1559
diff changeset
97
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
98 static int amf_parse_object(AVFormatContext *s, AVStream *astream, AVStream *vstream, const char *key, unsigned int max_pos, int depth) {
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
99 AVCodecContext *acodec, *vcodec;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
100 ByteIOContext *ioc;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
101 AMFDataType amf_type;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
102 char str_val[256];
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
103 double num_val;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
104
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
105 num_val = 0;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
106 ioc = s->pb;
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
107
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
108 amf_type = get_byte(ioc);
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
109
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
110 switch(amf_type) {
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
111 case AMF_DATA_TYPE_NUMBER:
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
112 num_val = av_int2dbl(get_be64(ioc)); break;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
113 case AMF_DATA_TYPE_BOOL:
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
114 num_val = get_byte(ioc); break;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
115 case AMF_DATA_TYPE_STRING:
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
116 if(amf_get_string(ioc, str_val, sizeof(str_val)) < 0)
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
117 return -1;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
118 break;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
119 case AMF_DATA_TYPE_OBJECT: {
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
120 unsigned int keylen;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
121
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
122 while(url_ftell(ioc) < max_pos - 2 && (keylen = get_be16(ioc))) {
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
123 url_fskip(ioc, keylen); //skip key string
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
124 if(amf_parse_object(s, NULL, NULL, NULL, max_pos, depth + 1) < 0)
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
125 return -1; //if we couldn't skip, bomb out.
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
126 }
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
127 if(get_byte(ioc) != AMF_END_OF_OBJECT)
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
128 return -1;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
129 }
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
130 break;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
131 case AMF_DATA_TYPE_NULL:
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
132 case AMF_DATA_TYPE_UNDEFINED:
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
133 case AMF_DATA_TYPE_UNSUPPORTED:
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
134 break; //these take up no additional space
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
135 case AMF_DATA_TYPE_MIXEDARRAY:
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
136 url_fskip(ioc, 4); //skip 32-bit max array index
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
137 while(url_ftell(ioc) < max_pos - 2 && amf_get_string(ioc, str_val, sizeof(str_val)) > 0) {
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
138 //this is the only case in which we would want a nested parse to not skip over the object
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
139 if(amf_parse_object(s, astream, vstream, str_val, max_pos, depth + 1) < 0)
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
140 return -1;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
141 }
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
142 if(get_byte(ioc) != AMF_END_OF_OBJECT)
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
143 return -1;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
144 break;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
145 case AMF_DATA_TYPE_ARRAY: {
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
146 unsigned int arraylen, i;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
147
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
148 arraylen = get_be32(ioc);
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
149 for(i = 0; i < arraylen && url_ftell(ioc) < max_pos - 1; i++) {
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
150 if(amf_parse_object(s, NULL, NULL, NULL, max_pos, depth + 1) < 0)
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
151 return -1; //if we couldn't skip, bomb out.
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
152 }
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
153 }
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
154 break;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
155 case AMF_DATA_TYPE_DATE:
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
156 url_fskip(ioc, 8 + 2); //timestamp (double) and UTC offset (int16)
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
157 break;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
158 default: //unsupported type, we couldn't skip
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
159 return -1;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
160 }
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
161
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
162 if(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
163 acodec = astream ? astream->codec : NULL;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
164 vcodec = vstream ? vstream->codec : NULL;
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(amf_type == AMF_DATA_TYPE_BOOL) {
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
167 if(!strcmp(key, "stereo") && acodec) acodec->channels = num_val > 0 ? 2 : 1;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
168 } else if(amf_type == AMF_DATA_TYPE_NUMBER) {
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
169 if(!strcmp(key, "duration")) s->duration = num_val * AV_TIME_BASE;
1719
f813f8755dd1 flv follows in movs footsteps and has random trash in the width/height fields
michael
parents: 1718
diff changeset
170 // else if(!strcmp(key, "width") && vcodec && num_val > 0) vcodec->width = num_val;
f813f8755dd1 flv follows in movs footsteps and has random trash in the width/height fields
michael
parents: 1718
diff changeset
171 // else if(!strcmp(key, "height") && vcodec && num_val > 0) vcodec->height = num_val;
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
172 else if(!strcmp(key, "audiocodecid") && acodec) flv_set_audio_codec(s, astream, (int)num_val << FLV_AUDIO_CODECID_OFFSET);
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
173 else if(!strcmp(key, "videocodecid") && vcodec) flv_set_video_codec(s, vstream, (int)num_val);
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
174 else if(!strcmp(key, "audiosamplesize") && acodec && num_val >= 0) {
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
175 acodec->bits_per_sample = num_val;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
176 //we may have to rewrite a previously read codecid because FLV only marks PCM endianness.
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
177 if(num_val == 8 && (acodec->codec_id == CODEC_ID_PCM_S16BE || acodec->codec_id == CODEC_ID_PCM_S16LE))
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
178 acodec->codec_id = CODEC_ID_PCM_S8;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
179 }
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
180 else if(!strcmp(key, "audiosamplerate") && acodec && num_val >= 0) {
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
181 //some tools, like FLVTool2, write consistently approximate metadata sample rates
2847
f2a69a8c657d Correctly handle FLV_CODECID_NELLYMOSER_8HZ_MONO files
banan
parents: 2771
diff changeset
182 if (!acodec->sample_rate) {
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
183 switch((int)num_val) {
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
184 case 44000: acodec->sample_rate = 44100 ; break;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
185 case 22000: acodec->sample_rate = 22050 ; break;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
186 case 11000: acodec->sample_rate = 11025 ; break;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
187 case 5000 : acodec->sample_rate = 5512 ; break;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
188 default : acodec->sample_rate = num_val;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
189 }
2847
f2a69a8c657d Correctly handle FLV_CODECID_NELLYMOSER_8HZ_MONO files
banan
parents: 2771
diff changeset
190 }
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
191 }
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
192 }
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
193 }
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
194
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
195 return 0;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
196 }
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
197
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
198 static int flv_read_metabody(AVFormatContext *s, unsigned int next_pos) {
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
199 AMFDataType type;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
200 AVStream *stream, *astream, *vstream;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
201 ByteIOContext *ioc;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
202 int i, keylen;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
203 char buffer[11]; //only needs to hold the string "onMetaData". Anything longer is something we don't want.
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
204
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
205 astream = NULL;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
206 vstream = NULL;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
207 keylen = 0;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
208 ioc = s->pb;
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
209
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
210 //first object needs to be "onMetaData" string
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
211 type = get_byte(ioc);
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
212 if(type != AMF_DATA_TYPE_STRING || amf_get_string(ioc, buffer, sizeof(buffer)) < 0 || strcmp(buffer, "onMetaData"))
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
213 return -1;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
214
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
215 //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
216 for(i = 0; i < s->nb_streams; i++) {
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
217 stream = s->streams[i];
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
218 if (stream->codec->codec_type == CODEC_TYPE_AUDIO) astream = stream;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
219 else if(stream->codec->codec_type == CODEC_TYPE_VIDEO) vstream = stream;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
220 }
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
221
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
222 //parse the second object (we want a mixed array)
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
223 if(amf_parse_object(s, astream, vstream, buffer, next_pos, 0) < 0)
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
224 return -1;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
225
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
226 return 0;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
227 }
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
228
2691
002ab6bbf9db factorize stream creation
michael
parents: 2604
diff changeset
229 static AVStream *create_stream(AVFormatContext *s, int is_audio){
002ab6bbf9db factorize stream creation
michael
parents: 2604
diff changeset
230 AVStream *st = av_new_stream(s, is_audio);
002ab6bbf9db factorize stream creation
michael
parents: 2604
diff changeset
231 if (!st)
002ab6bbf9db factorize stream creation
michael
parents: 2604
diff changeset
232 return NULL;
002ab6bbf9db factorize stream creation
michael
parents: 2604
diff changeset
233 st->codec->codec_type = is_audio ? CODEC_TYPE_AUDIO : CODEC_TYPE_VIDEO;
002ab6bbf9db factorize stream creation
michael
parents: 2604
diff changeset
234 av_set_pts_info(st, 24, 1, 1000); /* 24 bit pts in ms */
002ab6bbf9db factorize stream creation
michael
parents: 2604
diff changeset
235 return st;
002ab6bbf9db factorize stream creation
michael
parents: 2604
diff changeset
236 }
002ab6bbf9db factorize stream creation
michael
parents: 2604
diff changeset
237
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
238 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
239 AVFormatParameters *ap)
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
240 {
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
241 int offset, flags;
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
242
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
243 url_fskip(s->pb, 4);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
244 flags = get_byte(s->pb);
1886
cf8db4fe9efa workaround for broken flvtoolized files
alex
parents: 1719
diff changeset
245 /* old flvtool cleared this field */
cf8db4fe9efa workaround for broken flvtoolized files
alex
parents: 1719
diff changeset
246 /* FIXME: better fix needed */
cf8db4fe9efa workaround for broken flvtoolized files
alex
parents: 1719
diff changeset
247 if (!flags) {
cf8db4fe9efa workaround for broken flvtoolized files
alex
parents: 1719
diff changeset
248 flags = FLV_HEADER_FLAG_HASVIDEO | FLV_HEADER_FLAG_HASAUDIO;
cf8db4fe9efa workaround for broken flvtoolized files
alex
parents: 1719
diff changeset
249 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
250 }
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
251
1559
515e80ef01e6 get rid of AVFMTCTX_NOHEADER, create streams in read_header()
michael
parents: 1553
diff changeset
252 if(flags & FLV_HEADER_FLAG_HASVIDEO){
2691
002ab6bbf9db factorize stream creation
michael
parents: 2604
diff changeset
253 if(!create_stream(s, 0))
2273
7eb456c4ed8a Replace all occurrences of AVERROR_NOMEM with AVERROR(ENOMEM).
takis
parents: 2216
diff changeset
254 return AVERROR(ENOMEM);
1559
515e80ef01e6 get rid of AVFMTCTX_NOHEADER, create streams in read_header()
michael
parents: 1553
diff changeset
255 }
515e80ef01e6 get rid of AVFMTCTX_NOHEADER, create streams in read_header()
michael
parents: 1553
diff changeset
256 if(flags & FLV_HEADER_FLAG_HASAUDIO){
2691
002ab6bbf9db factorize stream creation
michael
parents: 2604
diff changeset
257 if(!create_stream(s, 1))
2273
7eb456c4ed8a Replace all occurrences of AVERROR_NOMEM with AVERROR(ENOMEM).
takis
parents: 2216
diff changeset
258 return AVERROR(ENOMEM);
1559
515e80ef01e6 get rid of AVFMTCTX_NOHEADER, create streams in read_header()
michael
parents: 1553
diff changeset
259 }
515e80ef01e6 get rid of AVFMTCTX_NOHEADER, create streams in read_header()
michael
parents: 1553
diff changeset
260
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
261 offset = get_be32(s->pb);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
262 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
263
1318
defa841523a9 FLV seeking patch by Nazo. lovesyao at aol com.
banan
parents: 1305
diff changeset
264 s->start_time = 0;
defa841523a9 FLV seeking patch by Nazo. lovesyao at aol com.
banan
parents: 1305
diff changeset
265
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
266 return 0;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
267 }
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
268
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
269 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
270 {
2571
41fefa61d999 revert r10527
aurel
parents: 2558
diff changeset
271 int ret, i, type, size, pts, flags, is_audio, next, pos;
679
54d87ed9b3e4 correct pcm in flv handling
alex
parents: 652
diff changeset
272 AVStream *st = NULL;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 822
diff changeset
273
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
274 for(;;){
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
275 pos = url_ftell(s->pb);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
276 url_fskip(s->pb, 4); /* size of previous packet */
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
277 type = get_byte(s->pb);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
278 size = get_be24(s->pb);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
279 pts = get_be24(s->pb);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
280 pts |= get_byte(s->pb) << 24;
2571
41fefa61d999 revert r10527
aurel
parents: 2558
diff changeset
281 // av_log(s, AV_LOG_DEBUG, "type:%d, size:%d, pts:%d\n", type, size, pts);
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
282 if (url_feof(s->pb))
2274
b21c2af60bc9 Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents: 2273
diff changeset
283 return AVERROR(EIO);
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
284 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
285 flags = 0;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 822
diff changeset
286
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
287 if(size == 0)
c1f88671135b cleanup
michael
parents: 378
diff changeset
288 continue;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 822
diff changeset
289
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
290 next= size + url_ftell(s->pb);
821
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
291
1553
504ceaa50e31 Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents: 1415
diff changeset
292 if (type == FLV_TAG_TYPE_AUDIO) {
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
293 is_audio=1;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
294 flags = get_byte(s->pb);
1553
504ceaa50e31 Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents: 1415
diff changeset
295 } else if (type == FLV_TAG_TYPE_VIDEO) {
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
296 is_audio=0;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
297 flags = get_byte(s->pb);
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
298 } else {
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
299 if (type == FLV_TAG_TYPE_META && size > 13+1+4)
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
300 flv_read_metabody(s, next);
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
301 else /* skip packet */
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
302 av_log(s, AV_LOG_ERROR, "skipping flv packet: type %d, size %d, flags %d\n", type, size, flags);
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
303 url_fseek(s->pb, next, SEEK_SET);
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
304 continue;
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
305 }
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
306
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
307 /* now find stream */
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
308 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
309 st = s->streams[i];
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
310 if (st->id == is_audio)
c1f88671135b cleanup
michael
parents: 378
diff changeset
311 break;
c1f88671135b cleanup
michael
parents: 378
diff changeset
312 }
c1f88671135b cleanup
michael
parents: 378
diff changeset
313 if(i == s->nb_streams){
1559
515e80ef01e6 get rid of AVFMTCTX_NOHEADER, create streams in read_header()
michael
parents: 1553
diff changeset
314 av_log(NULL, AV_LOG_ERROR, "invalid stream\n");
2692
d320b2990d7e support flv with invalid header
michael
parents: 2691
diff changeset
315 st= create_stream(s, is_audio);
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
316 }
708
d79164865a7c more fine grained discarding of packets
michael
parents: 684
diff changeset
317 // av_log(NULL, 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
318 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
319 ||(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
320 || st->discard >= AVDISCARD_ALL
d79164865a7c more fine grained discarding of packets
michael
parents: 684
diff changeset
321 ){
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
322 url_fseek(s->pb, next, SEEK_SET);
652
b47948262721 support discarding uninterresting packets
michael
parents: 620
diff changeset
323 continue;
b47948262721 support discarding uninterresting packets
michael
parents: 620
diff changeset
324 }
1553
504ceaa50e31 Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents: 1415
diff changeset
325 if ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY)
2571
41fefa61d999 revert r10527
aurel
parents: 2558
diff changeset
326 av_add_index_entry(st, pos, pts, size, 0, AVINDEX_KEYFRAME);
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
327 break;
c1f88671135b cleanup
michael
parents: 378
diff changeset
328 }
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
329
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
330 // 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
331 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
332 int size;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
333 const int pos= url_ftell(s->pb);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
334 const int fsize= url_fsize(s->pb);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
335 url_fseek(s->pb, fsize-4, SEEK_SET);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
336 size= get_be32(s->pb);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
337 url_fseek(s->pb, fsize-3-size, SEEK_SET);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
338 if(size == get_be24(s->pb) + 11){
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
339 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
340 }
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
341 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
342 }
bf3589ba8d7e move duration finding code into read_packet() so it can be skiped if duration has already been set
michael
parents: 1562
diff changeset
343
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
344 if(is_audio){
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
345 if(!st->codec->sample_rate || !st->codec->bits_per_sample || (!st->codec->codec_id && !st->codec->codec_tag)) {
1553
504ceaa50e31 Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents: 1415
diff changeset
346 st->codec->channels = (flags & FLV_AUDIO_CHANNEL_MASK) == FLV_STEREO ? 2 : 1;
504ceaa50e31 Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents: 1415
diff changeset
347 if((flags & FLV_AUDIO_CODECID_MASK) == FLV_CODECID_NELLYMOSER_8HZ_MONO)
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
348 st->codec->sample_rate= 8000;
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
349 else
1553
504ceaa50e31 Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents: 1415
diff changeset
350 st->codec->sample_rate = (44100 << ((flags & FLV_AUDIO_SAMPLERATE_MASK) >> FLV_AUDIO_SAMPLERATE_OFFSET) >> 3);
504ceaa50e31 Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents: 1415
diff changeset
351 st->codec->bits_per_sample = (flags & FLV_AUDIO_SAMPLESIZE_MASK) ? 16 : 8;
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
352 flv_set_audio_codec(s, st, flags & FLV_AUDIO_CODECID_MASK);
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
353 }
c1f88671135b cleanup
michael
parents: 378
diff changeset
354 }else{
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
355 size -= flv_set_video_codec(s, st, flags & FLV_VIDEO_CODECID_MASK);
378
abd83fc30f0e guess framerate
michael
parents: 376
diff changeset
356 }
abd83fc30f0e guess framerate
michael
parents: 376
diff changeset
357
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
358 ret= av_get_packet(s->pb, pkt, size - 1);
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
359 if (ret <= 0) {
2274
b21c2af60bc9 Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents: 2273
diff changeset
360 return AVERROR(EIO);
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
361 }
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
362 /* 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
363 packet */
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
364 pkt->size = ret;
2571
41fefa61d999 revert r10527
aurel
parents: 2558
diff changeset
365 pkt->pts = pts;
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
366 pkt->stream_index = st->index;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 822
diff changeset
367
1553
504ceaa50e31 Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents: 1415
diff changeset
368 if (is_audio || ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY))
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
369 pkt->flags |= PKT_FLAG_KEY;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 822
diff changeset
370
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
371 return ret;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
372 }
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
373
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
374 static int flv_read_close(AVFormatContext *s)
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
375 {
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
376 return 0;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
377 }
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
378
1318
defa841523a9 FLV seeking patch by Nazo. lovesyao at aol com.
banan
parents: 1305
diff changeset
379 static int flv_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp, int flags)
defa841523a9 FLV seeking patch by Nazo. lovesyao at aol com.
banan
parents: 1305
diff changeset
380 {
defa841523a9 FLV seeking patch by Nazo. lovesyao at aol com.
banan
parents: 1305
diff changeset
381 AVStream *st = s->streams[stream_index];
defa841523a9 FLV seeking patch by Nazo. lovesyao at aol com.
banan
parents: 1305
diff changeset
382 int index = av_index_search_timestamp(st, timestamp, flags);
defa841523a9 FLV seeking patch by Nazo. lovesyao at aol com.
banan
parents: 1305
diff changeset
383 if (index < 0)
defa841523a9 FLV seeking patch by Nazo. lovesyao at aol com.
banan
parents: 1305
diff changeset
384 return -1;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2756
diff changeset
385 url_fseek(s->pb, st->index_entries[index].pos, SEEK_SET);
1318
defa841523a9 FLV seeking patch by Nazo. lovesyao at aol com.
banan
parents: 1305
diff changeset
386
defa841523a9 FLV seeking patch by Nazo. lovesyao at aol com.
banan
parents: 1305
diff changeset
387 return 0;
defa841523a9 FLV seeking patch by Nazo. lovesyao at aol com.
banan
parents: 1305
diff changeset
388 }
defa841523a9 FLV seeking patch by Nazo. lovesyao at aol com.
banan
parents: 1305
diff changeset
389
1167
d89d7ef290da give AVInput/OutputFormat structs consistent names
mru
parents: 1101
diff changeset
390 AVInputFormat flv_demuxer = {
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
391 "flv",
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
392 "flv format",
2571
41fefa61d999 revert r10527
aurel
parents: 2558
diff changeset
393 0,
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
394 flv_probe,
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
395 flv_read_header,
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
396 flv_read_packet,
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
397 flv_read_close,
1318
defa841523a9 FLV seeking patch by Nazo. lovesyao at aol com.
banan
parents: 1305
diff changeset
398 flv_read_seek,
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
399 .extensions = "flv",
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
400 .value = CODEC_ID_FLV1,
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
401 };