annotate flvdec.c @ 2065:64bd1b09cef2 libavformat

patch so that the deprecated items show up correctly when building doxygen docs patch by mark cox melbournemark plus ffmpeg minus devel chez gmail dot com
author benoit
date Wed, 02 May 2007 09:13:47 +0000
parents a3e79d6e4e3c
children 1c30ea3c0fcf
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 *
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1318
diff changeset
5 * This file is part of FFmpeg.
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1318
diff changeset
6 *
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1318
diff changeset
7 * 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
8 * 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
9 * 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
10 * 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
11 *
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1318
diff changeset
12 * 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
13 * 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
14 * 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
15 * 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
16 *
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
17 * 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
18 * 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
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1413
f35535267409 document the extradata protocol for VP6F
aurel
parents: 1411
diff changeset
20 *
f35535267409 document the extradata protocol for VP6F
aurel
parents: 1411
diff changeset
21 *
f35535267409 document the extradata protocol for VP6F
aurel
parents: 1411
diff changeset
22 * This demuxer will generate a 1 byte extradata for VP6F content.
f35535267409 document the extradata protocol for VP6F
aurel
parents: 1411
diff changeset
23 * It is composed of:
f35535267409 document the extradata protocol for VP6F
aurel
parents: 1411
diff changeset
24 * - upper 4bits: difference between encoded width and visible width
f35535267409 document the extradata protocol for VP6F
aurel
parents: 1411
diff changeset
25 * - lower 4bits: difference between encoded height and visible height
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
26 */
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
27 #include "avformat.h"
1553
504ceaa50e31 Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents: 1415
diff changeset
28 #include "flv.h"
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
29
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
30 static int flv_probe(AVProbeData *p)
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
31 {
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
32 const uint8_t *d;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
33
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
34 d = p->buf;
1718
3eb35e92a29a improve probe and give it the max score
michael
parents: 1568
diff changeset
35 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
36 return AVPROBE_SCORE_MAX;
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
37 }
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
38 return 0;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
39 }
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
40
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
41 static void flv_set_audio_codec(AVFormatContext *s, AVStream *astream, int flv_codecid) {
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
42 AVCodecContext *acodec = astream->codec;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
43 switch(flv_codecid) {
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
44 //no distinction between S16 and S8 PCM codec flags
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
45 case FLV_CODECID_PCM_BE:
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
46 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
47 case FLV_CODECID_PCM_LE:
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
48 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
49 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
50 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
51 case FLV_CODECID_NELLYMOSER_8HZ_MONO:
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
52 acodec->sample_rate = 8000; //in case metadata does not otherwise declare samplerate
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
53 case FLV_CODECID_NELLYMOSER:
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
54 default:
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
55 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
56 acodec->codec_tag = flv_codecid >> FLV_AUDIO_CODECID_OFFSET;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
57 }
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 static int flv_set_video_codec(AVFormatContext *s, AVStream *vstream, int flv_codecid) {
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
61 AVCodecContext *vcodec = vstream->codec;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
62 switch(flv_codecid) {
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
63 case FLV_CODECID_H263 : vcodec->codec_id = CODEC_ID_FLV1 ; break;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
64 case FLV_CODECID_SCREEN: vcodec->codec_id = CODEC_ID_FLASHSV; break;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
65 case FLV_CODECID_VP6 : vcodec->codec_id = CODEC_ID_VP6F ;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
66 if(vcodec->extradata_size != 1) {
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
67 vcodec->extradata_size = 1;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
68 vcodec->extradata = av_malloc(1);
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
69 }
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
70 vcodec->extradata[0] = get_byte(&s->pb);
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
71 return 1; // 1 byte body size adjustment for flv_read_packet()
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
72 default:
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
73 av_log(s, AV_LOG_INFO, "Unsupported video codec (%x)\n", flv_codecid);
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
74 vcodec->codec_tag = flv_codecid;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
75 }
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
76
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
77 return 0;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
78 }
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
79
1560
f59b66f9d679 amf_get_string() by Allan Hsu allan aat counterpop doot net
michael
parents: 1559
diff changeset
80 static int amf_get_string(ByteIOContext *ioc, char *buffer, int buffsize) {
1561
a21addc40d10 cosmetics
michael
parents: 1560
diff changeset
81 int length = get_be16(ioc);
1560
f59b66f9d679 amf_get_string() by Allan Hsu allan aat counterpop doot net
michael
parents: 1559
diff changeset
82 if(length >= buffsize) {
f59b66f9d679 amf_get_string() by Allan Hsu allan aat counterpop doot net
michael
parents: 1559
diff changeset
83 url_fskip(ioc, length);
1561
a21addc40d10 cosmetics
michael
parents: 1560
diff changeset
84 return -1;
1560
f59b66f9d679 amf_get_string() by Allan Hsu allan aat counterpop doot net
michael
parents: 1559
diff changeset
85 }
f59b66f9d679 amf_get_string() by Allan Hsu allan aat counterpop doot net
michael
parents: 1559
diff changeset
86
f59b66f9d679 amf_get_string() by Allan Hsu allan aat counterpop doot net
michael
parents: 1559
diff changeset
87 get_buffer(ioc, buffer, length);
f59b66f9d679 amf_get_string() by Allan Hsu allan aat counterpop doot net
michael
parents: 1559
diff changeset
88
f59b66f9d679 amf_get_string() by Allan Hsu allan aat counterpop doot net
michael
parents: 1559
diff changeset
89 buffer[length] = '\0';
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 return 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
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
94 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
95 AVCodecContext *acodec, *vcodec;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
96 ByteIOContext *ioc;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
97 AMFDataType amf_type;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
98 char str_val[256];
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
99 double num_val;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
100
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
101 num_val = 0;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
102 ioc = &s->pb;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
103
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
104 amf_type = get_byte(ioc);
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
105
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
106 switch(amf_type) {
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
107 case AMF_DATA_TYPE_NUMBER:
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
108 num_val = av_int2dbl(get_be64(ioc)); break;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
109 case AMF_DATA_TYPE_BOOL:
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
110 num_val = get_byte(ioc); break;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
111 case AMF_DATA_TYPE_STRING:
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
112 if(amf_get_string(ioc, str_val, sizeof(str_val)) < 0)
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
113 return -1;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
114 break;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
115 case AMF_DATA_TYPE_OBJECT: {
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
116 unsigned int keylen;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
117
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
118 while(url_ftell(ioc) < max_pos - 2 && (keylen = get_be16(ioc))) {
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
119 url_fskip(ioc, keylen); //skip key string
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
120 if(amf_parse_object(s, NULL, NULL, NULL, max_pos, depth + 1) < 0)
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
121 return -1; //if we couldn't skip, bomb out.
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
122 }
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
123 if(get_byte(ioc) != AMF_END_OF_OBJECT)
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
124 return -1;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
125 }
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
126 break;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
127 case AMF_DATA_TYPE_NULL:
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
128 case AMF_DATA_TYPE_UNDEFINED:
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
129 case AMF_DATA_TYPE_UNSUPPORTED:
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
130 break; //these take up no additional space
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
131 case AMF_DATA_TYPE_MIXEDARRAY:
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
132 url_fskip(ioc, 4); //skip 32-bit max array index
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
133 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
134 //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
135 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
136 return -1;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
137 }
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
138 if(get_byte(ioc) != AMF_END_OF_OBJECT)
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
139 return -1;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
140 break;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
141 case AMF_DATA_TYPE_ARRAY: {
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
142 unsigned int arraylen, i;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
143
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
144 arraylen = get_be32(ioc);
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
145 for(i = 0; i < arraylen && url_ftell(ioc) < max_pos - 1; i++) {
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
146 if(amf_parse_object(s, NULL, NULL, NULL, max_pos, depth + 1) < 0)
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
147 return -1; //if we couldn't skip, bomb out.
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
148 }
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
149 }
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
150 break;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
151 case AMF_DATA_TYPE_DATE:
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
152 url_fskip(ioc, 8 + 2); //timestamp (double) and UTC offset (int16)
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 default: //unsupported type, we couldn't skip
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
155 return -1;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
156 }
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
157
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
158 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
159 acodec = astream ? astream->codec : NULL;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
160 vcodec = vstream ? vstream->codec : NULL;
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(amf_type == AMF_DATA_TYPE_BOOL) {
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
163 if(!strcmp(key, "stereo") && acodec) acodec->channels = num_val > 0 ? 2 : 1;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
164 } else if(amf_type == AMF_DATA_TYPE_NUMBER) {
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
165 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
166 // 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
167 // 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
168 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
169 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
170 else if(!strcmp(key, "audiosamplesize") && acodec && num_val >= 0) {
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
171 acodec->bits_per_sample = num_val;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
172 //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
173 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
174 acodec->codec_id = CODEC_ID_PCM_S8;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
175 }
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
176 else if(!strcmp(key, "audiosamplerate") && acodec && num_val >= 0) {
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
177 //some tools, like FLVTool2, write consistently approximate metadata sample rates
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
178 switch((int)num_val) {
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
179 case 44000: acodec->sample_rate = 44100 ; break;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
180 case 22000: acodec->sample_rate = 22050 ; break;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
181 case 11000: acodec->sample_rate = 11025 ; break;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
182 case 5000 : acodec->sample_rate = 5512 ; break;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
183 default : acodec->sample_rate = num_val;
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 }
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
187 }
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
188
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
189 return 0;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
190 }
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
191
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
192 static int flv_read_metabody(AVFormatContext *s, unsigned int next_pos) {
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
193 AMFDataType type;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
194 AVStream *stream, *astream, *vstream;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
195 ByteIOContext *ioc;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
196 int i, keylen;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
197 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
198
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
199 astream = NULL;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
200 vstream = NULL;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
201 keylen = 0;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
202 ioc = &s->pb;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
203
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
204 //first object needs to be "onMetaData" string
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
205 type = get_byte(ioc);
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
206 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
207 return -1;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
208
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
209 //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
210 for(i = 0; i < s->nb_streams; i++) {
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
211 stream = s->streams[i];
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
212 if (stream->codec->codec_type == CODEC_TYPE_AUDIO) astream = stream;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
213 else if(stream->codec->codec_type == CODEC_TYPE_VIDEO) vstream = stream;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
214 }
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
215
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
216 //parse the second object (we want a mixed array)
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
217 if(amf_parse_object(s, astream, vstream, buffer, next_pos, 0) < 0)
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
218 return -1;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
219
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
220 return 0;
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
221 }
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
222
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
223 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
224 AVFormatParameters *ap)
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
225 {
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
226 int offset, flags;
1559
515e80ef01e6 get rid of AVFMTCTX_NOHEADER, create streams in read_header()
michael
parents: 1553
diff changeset
227 AVStream *st;
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
228
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
229 url_fskip(&s->pb, 4);
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
230 flags = get_byte(&s->pb);
1886
cf8db4fe9efa workaround for broken flvtoolized files
alex
parents: 1719
diff changeset
231 /* old flvtool cleared this field */
cf8db4fe9efa workaround for broken flvtoolized files
alex
parents: 1719
diff changeset
232 /* FIXME: better fix needed */
cf8db4fe9efa workaround for broken flvtoolized files
alex
parents: 1719
diff changeset
233 if (!flags) {
cf8db4fe9efa workaround for broken flvtoolized files
alex
parents: 1719
diff changeset
234 flags = FLV_HEADER_FLAG_HASVIDEO | FLV_HEADER_FLAG_HASAUDIO;
cf8db4fe9efa workaround for broken flvtoolized files
alex
parents: 1719
diff changeset
235 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
236 }
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
237
1559
515e80ef01e6 get rid of AVFMTCTX_NOHEADER, create streams in read_header()
michael
parents: 1553
diff changeset
238 if(flags & FLV_HEADER_FLAG_HASVIDEO){
515e80ef01e6 get rid of AVFMTCTX_NOHEADER, create streams in read_header()
michael
parents: 1553
diff changeset
239 st = av_new_stream(s, 0);
515e80ef01e6 get rid of AVFMTCTX_NOHEADER, create streams in read_header()
michael
parents: 1553
diff changeset
240 if (!st)
515e80ef01e6 get rid of AVFMTCTX_NOHEADER, create streams in read_header()
michael
parents: 1553
diff changeset
241 return AVERROR_NOMEM;
515e80ef01e6 get rid of AVFMTCTX_NOHEADER, create streams in read_header()
michael
parents: 1553
diff changeset
242 st->codec->codec_type = CODEC_TYPE_VIDEO;
515e80ef01e6 get rid of AVFMTCTX_NOHEADER, create streams in read_header()
michael
parents: 1553
diff changeset
243 av_set_pts_info(st, 24, 1, 1000); /* 24 bit pts in ms */
515e80ef01e6 get rid of AVFMTCTX_NOHEADER, create streams in read_header()
michael
parents: 1553
diff changeset
244 }
515e80ef01e6 get rid of AVFMTCTX_NOHEADER, create streams in read_header()
michael
parents: 1553
diff changeset
245 if(flags & FLV_HEADER_FLAG_HASAUDIO){
515e80ef01e6 get rid of AVFMTCTX_NOHEADER, create streams in read_header()
michael
parents: 1553
diff changeset
246 st = av_new_stream(s, 1);
515e80ef01e6 get rid of AVFMTCTX_NOHEADER, create streams in read_header()
michael
parents: 1553
diff changeset
247 if (!st)
515e80ef01e6 get rid of AVFMTCTX_NOHEADER, create streams in read_header()
michael
parents: 1553
diff changeset
248 return AVERROR_NOMEM;
515e80ef01e6 get rid of AVFMTCTX_NOHEADER, create streams in read_header()
michael
parents: 1553
diff changeset
249 st->codec->codec_type = CODEC_TYPE_AUDIO;
515e80ef01e6 get rid of AVFMTCTX_NOHEADER, create streams in read_header()
michael
parents: 1553
diff changeset
250 av_set_pts_info(st, 24, 1, 1000); /* 24 bit pts in ms */
515e80ef01e6 get rid of AVFMTCTX_NOHEADER, create streams in read_header()
michael
parents: 1553
diff changeset
251 }
515e80ef01e6 get rid of AVFMTCTX_NOHEADER, create streams in read_header()
michael
parents: 1553
diff changeset
252
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
253 offset = get_be32(&s->pb);
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
254 url_fseek(&s->pb, offset, SEEK_SET);
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
255
1318
defa841523a9 FLV seeking patch by Nazo. lovesyao at aol com.
banan
parents: 1305
diff changeset
256 s->start_time = 0;
defa841523a9 FLV seeking patch by Nazo. lovesyao at aol com.
banan
parents: 1305
diff changeset
257
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
258 return 0;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
259 }
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
260
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
261 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
262 {
1318
defa841523a9 FLV seeking patch by Nazo. lovesyao at aol com.
banan
parents: 1305
diff changeset
263 int ret, i, type, size, pts, flags, is_audio, next, pos;
679
54d87ed9b3e4 correct pcm in flv handling
alex
parents: 652
diff changeset
264 AVStream *st = NULL;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 822
diff changeset
265
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
266 for(;;){
1318
defa841523a9 FLV seeking patch by Nazo. lovesyao at aol com.
banan
parents: 1305
diff changeset
267 pos = url_ftell(&s->pb);
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
268 url_fskip(&s->pb, 4); /* size of previous packet */
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
269 type = get_byte(&s->pb);
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
270 size = get_be24(&s->pb);
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
271 pts = get_be24(&s->pb);
376
20f644245408 flv fixes
michael
parents: 375
diff changeset
272 // av_log(s, AV_LOG_DEBUG, "type:%d, size:%d, pts:%d\n", type, size, pts);
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
273 if (url_feof(&s->pb))
482
0fdc96c2f2fe sweeping change from -EIO -> AVERROR_IO
melanson
parents: 462
diff changeset
274 return AVERROR_IO;
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
275 url_fskip(&s->pb, 4); /* reserved */
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
276 flags = 0;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 822
diff changeset
277
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
278 if(size == 0)
c1f88671135b cleanup
michael
parents: 378
diff changeset
279 continue;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 822
diff changeset
280
821
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
281 next= size + url_ftell(&s->pb);
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
282
1553
504ceaa50e31 Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents: 1415
diff changeset
283 if (type == FLV_TAG_TYPE_AUDIO) {
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
284 is_audio=1;
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
285 flags = get_byte(&s->pb);
1553
504ceaa50e31 Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents: 1415
diff changeset
286 } else if (type == FLV_TAG_TYPE_VIDEO) {
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
287 is_audio=0;
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
288 flags = get_byte(&s->pb);
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
289 } else {
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
290 if (type == FLV_TAG_TYPE_META && size > 13+1+4)
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
291 flv_read_metabody(s, next);
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
292 else /* skip packet */
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
293 av_log(s, AV_LOG_ERROR, "skipping flv packet: type %d, size %d, flags %d\n", type, size, flags);
821
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
294 url_fseek(&s->pb, next, SEEK_SET);
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
295 continue;
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
296 }
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
297
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
298 /* now find stream */
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
299 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
300 st = s->streams[i];
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
301 if (st->id == is_audio)
c1f88671135b cleanup
michael
parents: 378
diff changeset
302 break;
c1f88671135b cleanup
michael
parents: 378
diff changeset
303 }
c1f88671135b cleanup
michael
parents: 378
diff changeset
304 if(i == s->nb_streams){
1559
515e80ef01e6 get rid of AVFMTCTX_NOHEADER, create streams in read_header()
michael
parents: 1553
diff changeset
305 av_log(NULL, AV_LOG_ERROR, "invalid stream\n");
515e80ef01e6 get rid of AVFMTCTX_NOHEADER, create streams in read_header()
michael
parents: 1553
diff changeset
306 url_fseek(&s->pb, next, SEEK_SET);
515e80ef01e6 get rid of AVFMTCTX_NOHEADER, create streams in read_header()
michael
parents: 1553
diff changeset
307 continue;
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
308 }
708
d79164865a7c more fine grained discarding of packets
michael
parents: 684
diff changeset
309 // 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
310 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
311 ||(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
312 || st->discard >= AVDISCARD_ALL
d79164865a7c more fine grained discarding of packets
michael
parents: 684
diff changeset
313 ){
821
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
314 url_fseek(&s->pb, next, SEEK_SET);
652
b47948262721 support discarding uninterresting packets
michael
parents: 620
diff changeset
315 continue;
b47948262721 support discarding uninterresting packets
michael
parents: 620
diff changeset
316 }
1553
504ceaa50e31 Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents: 1415
diff changeset
317 if ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY)
1318
defa841523a9 FLV seeking patch by Nazo. lovesyao at aol com.
banan
parents: 1305
diff changeset
318 av_add_index_entry(st, pos, pts, size, 0, AVINDEX_KEYFRAME);
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
319 break;
c1f88671135b cleanup
michael
parents: 378
diff changeset
320 }
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
321
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
322 // if not streamed and no duration from metadata then seek to end to find the duration from the timestamps
bf3589ba8d7e move duration finding code into read_packet() so it can be skiped if duration has already been set
michael
parents: 1562
diff changeset
323 if(!url_is_streamed(&s->pb) && s->duration==AV_NOPTS_VALUE){
bf3589ba8d7e move duration finding code into read_packet() so it can be skiped if duration has already been set
michael
parents: 1562
diff changeset
324 int size;
bf3589ba8d7e move duration finding code into read_packet() so it can be skiped if duration has already been set
michael
parents: 1562
diff changeset
325 const int pos= url_ftell(&s->pb);
bf3589ba8d7e move duration finding code into read_packet() so it can be skiped if duration has already been set
michael
parents: 1562
diff changeset
326 const int fsize= url_fsize(&s->pb);
bf3589ba8d7e move duration finding code into read_packet() so it can be skiped if duration has already been set
michael
parents: 1562
diff changeset
327 url_fseek(&s->pb, fsize-4, SEEK_SET);
bf3589ba8d7e move duration finding code into read_packet() so it can be skiped if duration has already been set
michael
parents: 1562
diff changeset
328 size= get_be32(&s->pb);
bf3589ba8d7e move duration finding code into read_packet() so it can be skiped if duration has already been set
michael
parents: 1562
diff changeset
329 url_fseek(&s->pb, fsize-3-size, SEEK_SET);
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(size == get_be24(&s->pb) + 11){
bf3589ba8d7e move duration finding code into read_packet() so it can be skiped if duration has already been set
michael
parents: 1562
diff changeset
331 s->duration= get_be24(&s->pb) * (int64_t)AV_TIME_BASE / 1000;
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 }
bf3589ba8d7e move duration finding code into read_packet() so it can be skiped if duration has already been set
michael
parents: 1562
diff changeset
333 url_fseek(&s->pb, pos, SEEK_SET);
bf3589ba8d7e move duration finding code into read_packet() so it can be skiped if duration has already been set
michael
parents: 1562
diff changeset
334 }
bf3589ba8d7e move duration finding code into read_packet() so it can be skiped if duration has already been set
michael
parents: 1562
diff changeset
335
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
336 if(is_audio){
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
337 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
338 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
339 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
340 st->codec->sample_rate= 8000;
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
341 else
1553
504ceaa50e31 Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents: 1415
diff changeset
342 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
343 st->codec->bits_per_sample = (flags & FLV_AUDIO_SAMPLESIZE_MASK) ? 16 : 8;
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
344 flv_set_audio_codec(s, st, flags & FLV_AUDIO_CODECID_MASK);
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
345 }
c1f88671135b cleanup
michael
parents: 378
diff changeset
346 }else{
1568
04aa1ab71309 add FLV decoder metadata parsing
gpoirier
parents: 1563
diff changeset
347 size -= flv_set_video_codec(s, st, flags & FLV_VIDEO_CODECID_MASK);
378
abd83fc30f0e guess framerate
michael
parents: 376
diff changeset
348 }
abd83fc30f0e guess framerate
michael
parents: 376
diff changeset
349
821
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
350 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
351 if (ret <= 0) {
482
0fdc96c2f2fe sweeping change from -EIO -> AVERROR_IO
melanson
parents: 462
diff changeset
352 return AVERROR_IO;
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
353 }
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
354 /* 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
355 packet */
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
356 pkt->size = ret;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
357 pkt->pts = pts;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
358 pkt->stream_index = st->index;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 822
diff changeset
359
1553
504ceaa50e31 Defines various common FLV format values between the FLV muxer and demuxer
aurel
parents: 1415
diff changeset
360 if (is_audio || ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY))
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
361 pkt->flags |= PKT_FLAG_KEY;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 822
diff changeset
362
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
363 return ret;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
364 }
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
365
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
366 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
367 {
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
368 return 0;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
369 }
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
370
1318
defa841523a9 FLV seeking patch by Nazo. lovesyao at aol com.
banan
parents: 1305
diff changeset
371 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
372 {
defa841523a9 FLV seeking patch by Nazo. lovesyao at aol com.
banan
parents: 1305
diff changeset
373 AVStream *st = s->streams[stream_index];
defa841523a9 FLV seeking patch by Nazo. lovesyao at aol com.
banan
parents: 1305
diff changeset
374 int index = av_index_search_timestamp(st, timestamp, flags);
defa841523a9 FLV seeking patch by Nazo. lovesyao at aol com.
banan
parents: 1305
diff changeset
375 if (index < 0)
defa841523a9 FLV seeking patch by Nazo. lovesyao at aol com.
banan
parents: 1305
diff changeset
376 return -1;
defa841523a9 FLV seeking patch by Nazo. lovesyao at aol com.
banan
parents: 1305
diff changeset
377 url_fseek(&s->pb, st->index_entries[index].pos, SEEK_SET);
defa841523a9 FLV seeking patch by Nazo. lovesyao at aol com.
banan
parents: 1305
diff changeset
378
defa841523a9 FLV seeking patch by Nazo. lovesyao at aol com.
banan
parents: 1305
diff changeset
379 return 0;
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
1167
d89d7ef290da give AVInput/OutputFormat structs consistent names
mru
parents: 1101
diff changeset
382 AVInputFormat flv_demuxer = {
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
383 "flv",
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
384 "flv format",
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
385 0,
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
386 flv_probe,
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
387 flv_read_header,
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
388 flv_read_packet,
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
389 flv_read_close,
1318
defa841523a9 FLV seeking patch by Nazo. lovesyao at aol com.
banan
parents: 1305
diff changeset
390 flv_read_seek,
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
391 .extensions = "flv",
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
392 .value = CODEC_ID_FLV1,
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
393 };