annotate flvdec.c @ 947:929f84cc63c3 libavformat

stsd fix by (Baptiste COUDURIER )baptiste.coudurier smartjog com)
author michael
date Sat, 11 Feb 2006 21:43:21 +0000
parents edbe5c3717f9
children 99ae26ee88d8
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 /*
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
2 * FLV encoder.
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 *
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
5 * This library is free software; you can redistribute it and/or
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
6 * 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
7 * License as published by the Free Software Foundation; either
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
8 * version 2 of the License, or (at your option) any later version.
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
9 *
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
10 * This library is distributed in the hope that it will be useful,
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
11 * 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
12 * 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
13 * 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
14 *
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
15 * You should have received a copy of the GNU Lesser General Public
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
16 * License along with this library; if not, write to the Free Software
896
edbe5c3717f9 Update licensing information: The FSF changed postal address.
diego
parents: 887
diff changeset
17 * 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
18 */
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
19 #include "avformat.h"
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
20
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
21 static int flv_probe(AVProbeData *p)
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
22 {
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
23 const uint8_t *d;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
24
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
25 if (p->buf_size < 6)
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
26 return 0;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
27 d = p->buf;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
28 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
29 return 50;
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 return 0;
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
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
34 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
35 AVFormatParameters *ap)
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 int offset, flags;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 822
diff changeset
38
378
abd83fc30f0e guess framerate
michael
parents: 376
diff changeset
39 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
40
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
41 url_fskip(&s->pb, 4);
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
42 flags = get_byte(&s->pb);
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
43
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
44 offset = get_be32(&s->pb);
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
45 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
46
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
47 return 0;
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
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
50 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
51 {
821
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
52 int ret, i, type, size, pts, flags, is_audio, next;
679
54d87ed9b3e4 correct pcm in flv handling
alex
parents: 652
diff changeset
53 AVStream *st = NULL;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 822
diff changeset
54
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
55 for(;;){
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
56 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
57 type = get_byte(&s->pb);
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
58 size = get_be24(&s->pb);
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
59 pts = get_be24(&s->pb);
376
20f644245408 flv fixes
michael
parents: 375
diff changeset
60 // 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
61 if (url_feof(&s->pb))
482
0fdc96c2f2fe sweeping change from -EIO -> AVERROR_IO
melanson
parents: 462
diff changeset
62 return AVERROR_IO;
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
63 url_fskip(&s->pb, 4); /* reserved */
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
64 flags = 0;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 822
diff changeset
65
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
66 if(size == 0)
c1f88671135b cleanup
michael
parents: 378
diff changeset
67 continue;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 822
diff changeset
68
821
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
69 next= size + url_ftell(&s->pb);
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
70
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
71 if (type == 8) {
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
72 is_audio=1;
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
73 flags = get_byte(&s->pb);
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
74 } else if (type == 9) {
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
75 is_audio=0;
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
76 flags = get_byte(&s->pb);
821
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
77 } else if (type == 18 && size > 13+1+4) {
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
78 url_fskip(&s->pb, 13); //onMetaData blah
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
79 if(get_byte(&s->pb) == 8){
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
80 url_fskip(&s->pb, 4);
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
81 }
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
82 while(url_ftell(&s->pb) + 5 < next){
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
83 char tmp[128];
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
84 int type, len;
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
85 double d= 0;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 822
diff changeset
86
821
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
87 len= get_be16(&s->pb);
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
88 if(len >= sizeof(tmp) || !len)
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
89 break;
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
90 get_buffer(&s->pb, tmp, len);
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
91 tmp[len]=0;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 822
diff changeset
92
821
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
93 type= get_byte(&s->pb);
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
94 if(type==0){
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
95 d= av_int2dbl(get_be64(&s->pb));
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
96 }else if(type==2){
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
97 len= get_be16(&s->pb);
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
98 if(len >= sizeof(tmp))
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
99 break;
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
100 url_fskip(&s->pb, len);
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
101 }else if(type==8){
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
102 //array
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
103 break;
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
104 }else if(type==11){
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
105 d= av_int2dbl(get_be64(&s->pb));
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
106 get_be16(&s->pb);
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
107 }
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 if(!strcmp(tmp, "duration")){
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
110 s->duration = d*AV_TIME_BASE;
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
111 }else if(!strcmp(tmp, "videodatarate")){
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
112 }else if(!strcmp(tmp, "audiodatarate")){
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
113 }
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
114 }
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
115 url_fseek(&s->pb, next, SEEK_SET);
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
116 continue;
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
117 } else {
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
118 /* skip packet */
370
845f9de2c883 av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 232
diff changeset
119 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
120 url_fseek(&s->pb, next, SEEK_SET);
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
121 continue;
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
122 }
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
123
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
124 /* now find stream */
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
125 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
126 st = s->streams[i];
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
127 if (st->id == is_audio)
c1f88671135b cleanup
michael
parents: 378
diff changeset
128 break;
c1f88671135b cleanup
michael
parents: 378
diff changeset
129 }
c1f88671135b cleanup
michael
parents: 378
diff changeset
130 if(i == s->nb_streams){
c1f88671135b cleanup
michael
parents: 378
diff changeset
131 st = av_new_stream(s, is_audio);
c1f88671135b cleanup
michael
parents: 378
diff changeset
132 if (!st)
c1f88671135b cleanup
michael
parents: 378
diff changeset
133 return AVERROR_NOMEM;
462
b69898ffc92a move time_base (pts_num/pts_den) from AVFormatContext -> AVStream
michael
parents: 445
diff changeset
134
b69898ffc92a move time_base (pts_num/pts_den) from AVFormatContext -> AVStream
michael
parents: 445
diff changeset
135 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
136 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
137 }
708
d79164865a7c more fine grained discarding of packets
michael
parents: 684
diff changeset
138 // 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
139 if( (st->discard >= AVDISCARD_NONKEY && !((flags >> 4)==1 || is_audio))
d79164865a7c more fine grained discarding of packets
michael
parents: 684
diff changeset
140 ||(st->discard >= AVDISCARD_BIDIR && ((flags >> 4)==3 && !is_audio))
d79164865a7c more fine grained discarding of packets
michael
parents: 684
diff changeset
141 || st->discard >= AVDISCARD_ALL
d79164865a7c more fine grained discarding of packets
michael
parents: 684
diff changeset
142 ){
821
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
143 url_fseek(&s->pb, next, SEEK_SET);
652
b47948262721 support discarding uninterresting packets
michael
parents: 620
diff changeset
144 continue;
b47948262721 support discarding uninterresting packets
michael
parents: 620
diff changeset
145 }
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
146 break;
c1f88671135b cleanup
michael
parents: 378
diff changeset
147 }
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
148
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
149 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
150 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
151 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
152 st->codec->channels = (flags&1)+1;
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
153 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
154 st->codec->sample_rate= 8000;
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
155 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
156 st->codec->sample_rate = (44100<<((flags>>2)&3))>>3;
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
157 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
158 case 0: if (flags&2) st->codec->codec_id = CODEC_ID_PCM_S16BE;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
159 else st->codec->codec_id = CODEC_ID_PCM_S8; break;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
160 case 1: st->codec->codec_id = CODEC_ID_ADPCM_SWF; break;
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
161 case 2: st->codec->codec_id = CODEC_ID_MP3; break;
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
162 // this is not listed at FLV but at SWF, strange...
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
163 case 3: if (flags&2) st->codec->codec_id = CODEC_ID_PCM_S16LE;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
164 else st->codec->codec_id = CODEC_ID_PCM_S8; break;
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
165 default:
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
166 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
167 st->codec->codec_tag= (flags >> 4);
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
168 }
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
169 st->codec->bits_per_sample = (flags & 2) ? 16 : 8;
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
170 }
c1f88671135b cleanup
michael
parents: 378
diff changeset
171 }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
172 st->codec->codec_type = CODEC_TYPE_VIDEO;
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
173 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
174 case 2: st->codec->codec_id = CODEC_ID_FLV1; break;
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
175 default:
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
176 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
177 st->codec->codec_tag= flags & 0xF;
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
178 }
378
abd83fc30f0e guess framerate
michael
parents: 376
diff changeset
179 }
abd83fc30f0e guess framerate
michael
parents: 376
diff changeset
180
821
92dfb26763e4 extract duration if available
michael
parents: 820
diff changeset
181 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
182 if (ret <= 0) {
482
0fdc96c2f2fe sweeping change from -EIO -> AVERROR_IO
melanson
parents: 462
diff changeset
183 return AVERROR_IO;
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
184 }
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
185 /* 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
186 packet */
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
187 pkt->size = ret;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
188 pkt->pts = pts;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
189 pkt->stream_index = st->index;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 822
diff changeset
190
708
d79164865a7c more fine grained discarding of packets
michael
parents: 684
diff changeset
191 if (is_audio || ((flags >> 4)==1))
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
192 pkt->flags |= PKT_FLAG_KEY;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 822
diff changeset
193
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
194 return ret;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
195 }
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
196
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
197 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
198 {
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
199 return 0;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
200 }
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
201
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
202 AVInputFormat flv_iformat = {
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
203 "flv",
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
204 "flv format",
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
205 0,
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
206 flv_probe,
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
207 flv_read_header,
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
208 flv_read_packet,
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
209 flv_read_close,
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
210 .extensions = "flv",
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
211 .value = CODEC_ID_FLV1,
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
212 };
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
213
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
214 int flvdec_init(void)
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
215 {
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
216 av_register_input_format(&flv_iformat);
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
217 return 0;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
218 }