annotate flvdec.c @ 1468:3f467725b70f libavformat

add support for AAC in matroska
author aurel
date Wed, 08 Nov 2006 20:13:30 +0000
parents 3b00fb8ef8e4
children 504ceaa50e31
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"
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 if (p->buf_size < 6)
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
34 return 0;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
35 d = p->buf;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
36 if (d[0] == 'F' && d[1] == 'L' && d[2] == 'V') {
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
37 return 50;
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 return 0;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
40 }
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
41
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
42 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
43 AVFormatParameters *ap)
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
44 {
1015
99ae26ee88d8 extract duration
michael
parents: 896
diff changeset
45 int offset, flags, size;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 822
diff changeset
46
378
abd83fc30f0e guess framerate
michael
parents: 376
diff changeset
47 s->ctx_flags |= AVFMTCTX_NOHEADER; //ok we have a header but theres no fps, codec type, sample_rate, ...
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
48
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
49 url_fskip(&s->pb, 4);
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
50 flags = get_byte(&s->pb);
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
51
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
52 offset = get_be32(&s->pb);
1015
99ae26ee88d8 extract duration
michael
parents: 896
diff changeset
53
99ae26ee88d8 extract duration
michael
parents: 896
diff changeset
54 if(!url_is_streamed(&s->pb)){
99ae26ee88d8 extract duration
michael
parents: 896
diff changeset
55 const int fsize= url_fsize(&s->pb);
99ae26ee88d8 extract duration
michael
parents: 896
diff changeset
56 url_fseek(&s->pb, fsize-4, SEEK_SET);
99ae26ee88d8 extract duration
michael
parents: 896
diff changeset
57 size= get_be32(&s->pb);
99ae26ee88d8 extract duration
michael
parents: 896
diff changeset
58 url_fseek(&s->pb, fsize-3-size, SEEK_SET);
99ae26ee88d8 extract duration
michael
parents: 896
diff changeset
59 if(size == get_be24(&s->pb) + 11){
99ae26ee88d8 extract duration
michael
parents: 896
diff changeset
60 s->duration= get_be24(&s->pb) * (int64_t)AV_TIME_BASE / 1000;
99ae26ee88d8 extract duration
michael
parents: 896
diff changeset
61 }
99ae26ee88d8 extract duration
michael
parents: 896
diff changeset
62 }
99ae26ee88d8 extract duration
michael
parents: 896
diff changeset
63
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
64 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
65
1318
defa841523a9 FLV seeking patch by Nazo. lovesyao at aol com.
banan
parents: 1305
diff changeset
66 s->start_time = 0;
defa841523a9 FLV seeking patch by Nazo. lovesyao at aol com.
banan
parents: 1305
diff changeset
67
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
68 return 0;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
69 }
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
70
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
71 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
72 {
1318
defa841523a9 FLV seeking patch by Nazo. lovesyao at aol com.
banan
parents: 1305
diff changeset
73 int ret, i, type, size, pts, flags, is_audio, next, pos;
679
54d87ed9b3e4 correct pcm in flv handling
alex
parents: 652
diff changeset
74 AVStream *st = NULL;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 822
diff changeset
75
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
76 for(;;){
1318
defa841523a9 FLV seeking patch by Nazo. lovesyao at aol com.
banan
parents: 1305
diff changeset
77 pos = url_ftell(&s->pb);
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
78 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
79 type = get_byte(&s->pb);
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
80 size = get_be24(&s->pb);
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
81 pts = get_be24(&s->pb);
376
20f644245408 flv fixes
michael
parents: 375
diff changeset
82 // 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
83 if (url_feof(&s->pb))
482
0fdc96c2f2fe sweeping change from -EIO -> AVERROR_IO
melanson
parents: 462
diff changeset
84 return AVERROR_IO;
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
85 url_fskip(&s->pb, 4); /* reserved */
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
86 flags = 0;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 822
diff changeset
87
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
88 if(size == 0)
c1f88671135b cleanup
michael
parents: 378
diff changeset
89 continue;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 822
diff changeset
90
821
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
91 next= size + url_ftell(&s->pb);
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
92
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
93 if (type == 8) {
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
94 is_audio=1;
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
95 flags = get_byte(&s->pb);
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
96 } else if (type == 9) {
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
97 is_audio=0;
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
98 flags = get_byte(&s->pb);
821
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
99 } else if (type == 18 && size > 13+1+4) {
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
100 url_fskip(&s->pb, 13); //onMetaData blah
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
101 if(get_byte(&s->pb) == 8){
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
102 url_fskip(&s->pb, 4);
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
103 }
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
104 while(url_ftell(&s->pb) + 5 < next){
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
105 char tmp[128];
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
106 int type, len;
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
107 double d= 0;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 822
diff changeset
108
821
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
109 len= get_be16(&s->pb);
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
110 if(len >= sizeof(tmp) || !len)
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
111 break;
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
112 get_buffer(&s->pb, tmp, len);
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
113 tmp[len]=0;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 822
diff changeset
114
821
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
115 type= get_byte(&s->pb);
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
116 if(type==0){
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
117 d= av_int2dbl(get_be64(&s->pb));
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
118 }else if(type==2){
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
119 len= get_be16(&s->pb);
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
120 if(len >= sizeof(tmp))
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
121 break;
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
122 url_fskip(&s->pb, len);
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
123 }else if(type==8){
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
124 //array
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
125 break;
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
126 }else if(type==11){
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
127 d= av_int2dbl(get_be64(&s->pb));
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
128 get_be16(&s->pb);
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
129 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 822
diff changeset
130
821
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
131 if(!strcmp(tmp, "duration")){
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
132 s->duration = d*AV_TIME_BASE;
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
133 }else if(!strcmp(tmp, "videodatarate")){
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
134 }else if(!strcmp(tmp, "audiodatarate")){
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
135 }
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
136 }
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
137 url_fseek(&s->pb, next, SEEK_SET);
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
138 continue;
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
139 } else {
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
140 /* skip packet */
370
845f9de2c883 av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 232
diff changeset
141 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
142 url_fseek(&s->pb, next, SEEK_SET);
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
143 continue;
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
144 }
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
145
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
146 /* now find stream */
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
147 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
148 st = s->streams[i];
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
149 if (st->id == is_audio)
c1f88671135b cleanup
michael
parents: 378
diff changeset
150 break;
c1f88671135b cleanup
michael
parents: 378
diff changeset
151 }
c1f88671135b cleanup
michael
parents: 378
diff changeset
152 if(i == s->nb_streams){
c1f88671135b cleanup
michael
parents: 378
diff changeset
153 st = av_new_stream(s, is_audio);
c1f88671135b cleanup
michael
parents: 378
diff changeset
154 if (!st)
c1f88671135b cleanup
michael
parents: 378
diff changeset
155 return AVERROR_NOMEM;
462
b69898ffc92a move time_base (pts_num/pts_den) from AVFormatContext -> AVStream
michael
parents: 445
diff changeset
156
b69898ffc92a move time_base (pts_num/pts_den) from AVFormatContext -> AVStream
michael
parents: 445
diff changeset
157 av_set_pts_info(st, 24, 1, 1000); /* 24 bit pts in ms */
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
158 st->codec->time_base= (AVRational){1,1000};
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
159 }
708
d79164865a7c more fine grained discarding of packets
michael
parents: 684
diff changeset
160 // av_log(NULL, AV_LOG_DEBUG, "%d %X %d \n", is_audio, flags, st->discard);
d79164865a7c more fine grained discarding of packets
michael
parents: 684
diff changeset
161 if( (st->discard >= AVDISCARD_NONKEY && !((flags >> 4)==1 || is_audio))
d79164865a7c more fine grained discarding of packets
michael
parents: 684
diff changeset
162 ||(st->discard >= AVDISCARD_BIDIR && ((flags >> 4)==3 && !is_audio))
d79164865a7c more fine grained discarding of packets
michael
parents: 684
diff changeset
163 || st->discard >= AVDISCARD_ALL
d79164865a7c more fine grained discarding of packets
michael
parents: 684
diff changeset
164 ){
821
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
165 url_fseek(&s->pb, next, SEEK_SET);
652
b47948262721 support discarding uninterresting packets
michael
parents: 620
diff changeset
166 continue;
b47948262721 support discarding uninterresting packets
michael
parents: 620
diff changeset
167 }
1318
defa841523a9 FLV seeking patch by Nazo. lovesyao at aol com.
banan
parents: 1305
diff changeset
168 if ((flags >> 4)==1)
defa841523a9 FLV seeking patch by Nazo. lovesyao at aol com.
banan
parents: 1305
diff changeset
169 av_add_index_entry(st, pos, pts, size, 0, AVINDEX_KEYFRAME);
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
170 break;
c1f88671135b cleanup
michael
parents: 378
diff changeset
171 }
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
172
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
173 if(is_audio){
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
174 if(st->codec->sample_rate == 0){
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
175 st->codec->codec_type = CODEC_TYPE_AUDIO;
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
176 st->codec->channels = (flags&1)+1;
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
177 if((flags >> 4) == 5)
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
178 st->codec->sample_rate= 8000;
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
179 else
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
180 st->codec->sample_rate = (44100<<((flags>>2)&3))>>3;
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
181 switch(flags >> 4){/* 0: uncompressed 1: ADPCM 2: mp3 5: Nellymoser 8kHz mono 6: Nellymoser*/
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
182 case 0: if (flags&2) st->codec->codec_id = CODEC_ID_PCM_S16BE;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
183 else st->codec->codec_id = CODEC_ID_PCM_S8; break;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
184 case 1: st->codec->codec_id = CODEC_ID_ADPCM_SWF; break;
1385
8aa2dc127eb8 flv files from myspace with mp3 audio require need_parsing because the
rtogni
parents: 1358
diff changeset
185 case 2: st->codec->codec_id = CODEC_ID_MP3; st->need_parsing = 1; break;
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
186 // this is not listed at FLV but at SWF, strange...
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
187 case 3: if (flags&2) st->codec->codec_id = CODEC_ID_PCM_S16LE;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
188 else st->codec->codec_id = CODEC_ID_PCM_S8; break;
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
189 default:
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
190 av_log(s, AV_LOG_INFO, "Unsupported audio codec (%x)\n", flags >> 4);
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
191 st->codec->codec_tag= (flags >> 4);
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
192 }
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
193 st->codec->bits_per_sample = (flags & 2) ? 16 : 8;
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
194 }
c1f88671135b cleanup
michael
parents: 378
diff changeset
195 }else{
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
196 st->codec->codec_type = CODEC_TYPE_VIDEO;
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
197 switch(flags & 0xF){
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
198 case 2: st->codec->codec_id = CODEC_ID_FLV1; break;
1101
c4ad0ac3f999 Flash Screen Video decoder (fourcc:FSV1)
banan
parents: 1015
diff changeset
199 case 3: st->codec->codec_id = CODEC_ID_FLASHSV; break;
1305
541f4aa12efc VP5 and VP6 video decoder
aurel
parents: 1169
diff changeset
200 case 4:
541f4aa12efc VP5 and VP6 video decoder
aurel
parents: 1169
diff changeset
201 st->codec->codec_id = CODEC_ID_VP6F;
1411
822f6b8a9b5e use the adjustment value present in FLV to crop VP6 video
aurel
parents: 1385
diff changeset
202 if (st->codec->extradata_size != 1) {
822f6b8a9b5e use the adjustment value present in FLV to crop VP6 video
aurel
parents: 1385
diff changeset
203 st->codec->extradata_size = 1;
822f6b8a9b5e use the adjustment value present in FLV to crop VP6 video
aurel
parents: 1385
diff changeset
204 st->codec->extradata = av_malloc(1);
822f6b8a9b5e use the adjustment value present in FLV to crop VP6 video
aurel
parents: 1385
diff changeset
205 }
822f6b8a9b5e use the adjustment value present in FLV to crop VP6 video
aurel
parents: 1385
diff changeset
206 /* width and height adjustment */
822f6b8a9b5e use the adjustment value present in FLV to crop VP6 video
aurel
parents: 1385
diff changeset
207 st->codec->extradata[0] = get_byte(&s->pb);
1305
541f4aa12efc VP5 and VP6 video decoder
aurel
parents: 1169
diff changeset
208 size--;
541f4aa12efc VP5 and VP6 video decoder
aurel
parents: 1169
diff changeset
209 break;
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
210 default:
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
211 av_log(s, AV_LOG_INFO, "Unsupported video codec (%x)\n", flags & 0xf);
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
212 st->codec->codec_tag= flags & 0xF;
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
213 }
378
abd83fc30f0e guess framerate
michael
parents: 376
diff changeset
214 }
abd83fc30f0e guess framerate
michael
parents: 376
diff changeset
215
821
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
216 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
217 if (ret <= 0) {
482
0fdc96c2f2fe sweeping change from -EIO -> AVERROR_IO
melanson
parents: 462
diff changeset
218 return AVERROR_IO;
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
219 }
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
220 /* 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
221 packet */
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
222 pkt->size = ret;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
223 pkt->pts = pts;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
224 pkt->stream_index = st->index;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 822
diff changeset
225
708
d79164865a7c more fine grained discarding of packets
michael
parents: 684
diff changeset
226 if (is_audio || ((flags >> 4)==1))
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
227 pkt->flags |= PKT_FLAG_KEY;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 822
diff changeset
228
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
229 return ret;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
230 }
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
231
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
232 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
233 {
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
234 return 0;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
235 }
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
236
1318
defa841523a9 FLV seeking patch by Nazo. lovesyao at aol com.
banan
parents: 1305
diff changeset
237 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
238 {
defa841523a9 FLV seeking patch by Nazo. lovesyao at aol com.
banan
parents: 1305
diff changeset
239 AVStream *st = s->streams[stream_index];
defa841523a9 FLV seeking patch by Nazo. lovesyao at aol com.
banan
parents: 1305
diff changeset
240 int index = av_index_search_timestamp(st, timestamp, flags);
defa841523a9 FLV seeking patch by Nazo. lovesyao at aol com.
banan
parents: 1305
diff changeset
241 if (index < 0)
defa841523a9 FLV seeking patch by Nazo. lovesyao at aol com.
banan
parents: 1305
diff changeset
242 return -1;
defa841523a9 FLV seeking patch by Nazo. lovesyao at aol com.
banan
parents: 1305
diff changeset
243 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
244
defa841523a9 FLV seeking patch by Nazo. lovesyao at aol com.
banan
parents: 1305
diff changeset
245 return 0;
defa841523a9 FLV seeking patch by Nazo. lovesyao at aol com.
banan
parents: 1305
diff changeset
246 }
defa841523a9 FLV seeking patch by Nazo. lovesyao at aol com.
banan
parents: 1305
diff changeset
247
1167
d89d7ef290da give AVInput/OutputFormat structs consistent names
mru
parents: 1101
diff changeset
248 AVInputFormat flv_demuxer = {
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
249 "flv",
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
250 "flv format",
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
251 0,
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
252 flv_probe,
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
253 flv_read_header,
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
254 flv_read_packet,
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
255 flv_read_close,
1318
defa841523a9 FLV seeking patch by Nazo. lovesyao at aol com.
banan
parents: 1305
diff changeset
256 flv_read_seek,
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
257 .extensions = "flv",
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
258 .value = CODEC_ID_FLV1,
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
259 };