annotate flvdec.c @ 753:1fc7b1637f90 libavformat

Mac OS X 10.4 compilation fix by Steven M. Schultz <sms at 2BSD dot COM>
author diego
date Mon, 09 May 2005 10:48:12 +0000
parents af4e24d6310c
children c5077fdab490
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
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
17 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
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 unsigned int get_be24(ByteIOContext *s)
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 unsigned int val;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
24 val = get_byte(s) << 16;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
25 val |= get_byte(s) << 8;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
26 val |= get_byte(s);
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
27 return val;
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
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 if (p->buf_size < 6)
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
35 return 0;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
36 d = p->buf;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
37 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
38 return 50;
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 return 0;
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
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
43 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
44 AVFormatParameters *ap)
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
45 {
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
46 int offset, flags;
378
abd83fc30f0e guess framerate
michael
parents: 376
diff changeset
47
abd83fc30f0e guess framerate
michael
parents: 376
diff changeset
48 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
49
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
50 url_fskip(&s->pb, 4);
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
51 flags = get_byte(&s->pb);
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
52
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
53 offset = get_be32(&s->pb);
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
54 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
55
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
56 return 0;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
57 }
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
58
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
59 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
60 {
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
61 int ret, i, type, size, pts, flags, is_audio;
679
54d87ed9b3e4 correct pcm in flv handling
alex
parents: 652
diff changeset
62 AVStream *st = NULL;
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
63
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
64 for(;;){
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
65 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
66 type = get_byte(&s->pb);
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
67 size = get_be24(&s->pb);
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
68 pts = get_be24(&s->pb);
376
20f644245408 flv fixes
michael
parents: 375
diff changeset
69 // 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
70 if (url_feof(&s->pb))
482
0fdc96c2f2fe sweeping change from -EIO -> AVERROR_IO
melanson
parents: 462
diff changeset
71 return AVERROR_IO;
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
72 url_fskip(&s->pb, 4); /* reserved */
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
73 flags = 0;
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
74
c1f88671135b cleanup
michael
parents: 378
diff changeset
75 if(size == 0)
c1f88671135b cleanup
michael
parents: 378
diff changeset
76 continue;
c1f88671135b cleanup
michael
parents: 378
diff changeset
77
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
78 if (type == 8) {
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
79 is_audio=1;
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
80 flags = get_byte(&s->pb);
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
81 size--;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
82 } else if (type == 9) {
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
83 is_audio=0;
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
84 flags = get_byte(&s->pb);
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
85 size--;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
86 } else {
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
87 /* skip packet */
370
845f9de2c883 av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 232
diff changeset
88 av_log(s, AV_LOG_ERROR, "skipping flv packet: type %d, size %d, flags %d\n", type, size, flags);
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
89 url_fskip(&s->pb, size);
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
90 continue;
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
91 }
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
92
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
93 /* now find stream */
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
94 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
95 st = s->streams[i];
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
96 if (st->id == is_audio)
c1f88671135b cleanup
michael
parents: 378
diff changeset
97 break;
c1f88671135b cleanup
michael
parents: 378
diff changeset
98 }
c1f88671135b cleanup
michael
parents: 378
diff changeset
99 if(i == s->nb_streams){
c1f88671135b cleanup
michael
parents: 378
diff changeset
100 st = av_new_stream(s, is_audio);
c1f88671135b cleanup
michael
parents: 378
diff changeset
101 if (!st)
c1f88671135b cleanup
michael
parents: 378
diff changeset
102 return AVERROR_NOMEM;
462
b69898ffc92a move time_base (pts_num/pts_den) from AVFormatContext -> AVStream
michael
parents: 445
diff changeset
103
b69898ffc92a move time_base (pts_num/pts_den) from AVFormatContext -> AVStream
michael
parents: 445
diff changeset
104 av_set_pts_info(st, 24, 1, 1000); /* 24 bit pts in ms */
743
af4e24d6310c switch to native time bases
michael
parents: 708
diff changeset
105 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
106 }
708
d79164865a7c more fine grained discarding of packets
michael
parents: 684
diff changeset
107 // 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
108 if( (st->discard >= AVDISCARD_NONKEY && !((flags >> 4)==1 || is_audio))
d79164865a7c more fine grained discarding of packets
michael
parents: 684
diff changeset
109 ||(st->discard >= AVDISCARD_BIDIR && ((flags >> 4)==3 && !is_audio))
d79164865a7c more fine grained discarding of packets
michael
parents: 684
diff changeset
110 || st->discard >= AVDISCARD_ALL
d79164865a7c more fine grained discarding of packets
michael
parents: 684
diff changeset
111 ){
652
b47948262721 support discarding uninterresting packets
michael
parents: 620
diff changeset
112 url_fskip(&s->pb, size);
b47948262721 support discarding uninterresting packets
michael
parents: 620
diff changeset
113 continue;
b47948262721 support discarding uninterresting packets
michael
parents: 620
diff changeset
114 }
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
115 break;
c1f88671135b cleanup
michael
parents: 378
diff changeset
116 }
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
117
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
118 if(is_audio){
c1f88671135b cleanup
michael
parents: 378
diff changeset
119 if(st->codec.sample_rate == 0){
c1f88671135b cleanup
michael
parents: 378
diff changeset
120 st->codec.codec_type = CODEC_TYPE_AUDIO;
c1f88671135b cleanup
michael
parents: 378
diff changeset
121 st->codec.channels = (flags&1)+1;
c1f88671135b cleanup
michael
parents: 378
diff changeset
122 if((flags >> 4) == 5)
c1f88671135b cleanup
michael
parents: 378
diff changeset
123 st->codec.sample_rate= 8000;
c1f88671135b cleanup
michael
parents: 378
diff changeset
124 else
c1f88671135b cleanup
michael
parents: 378
diff changeset
125 st->codec.sample_rate = (44100<<((flags>>2)&3))>>3;
c1f88671135b cleanup
michael
parents: 378
diff changeset
126 switch(flags >> 4){/* 0: uncompressed 1: ADPCM 2: mp3 5: Nellymoser 8kHz mono 6: Nellymoser*/
679
54d87ed9b3e4 correct pcm in flv handling
alex
parents: 652
diff changeset
127 case 0: if (flags&2) st->codec.codec_id = CODEC_ID_PCM_S16BE;
54d87ed9b3e4 correct pcm in flv handling
alex
parents: 652
diff changeset
128 else st->codec.codec_id = CODEC_ID_PCM_S8; break;
680
0f77a8b8f348 support adpcm audio, also some more verbose messages
alex
parents: 679
diff changeset
129 case 1: st->codec.codec_id = CODEC_ID_ADPCM_SWF; break;
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
130 case 2: st->codec.codec_id = CODEC_ID_MP3; break;
679
54d87ed9b3e4 correct pcm in flv handling
alex
parents: 652
diff changeset
131 // this is not listed at FLV but at SWF, strange...
54d87ed9b3e4 correct pcm in flv handling
alex
parents: 652
diff changeset
132 case 3: if (flags&2) st->codec.codec_id = CODEC_ID_PCM_S16LE;
54d87ed9b3e4 correct pcm in flv handling
alex
parents: 652
diff changeset
133 else st->codec.codec_id = CODEC_ID_PCM_S8; break;
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
134 default:
680
0f77a8b8f348 support adpcm audio, also some more verbose messages
alex
parents: 679
diff changeset
135 av_log(s, AV_LOG_INFO, "Unsupported audio codec (%x)\n", flags >> 4);
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
136 st->codec.codec_tag= (flags >> 4);
c1f88671135b cleanup
michael
parents: 378
diff changeset
137 }
684
d7c7f7bbdf55 proper handling of samplesize
alex
parents: 683
diff changeset
138 st->codec.bits_per_sample = (flags & 2) ? 16 : 8;
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
139 }
c1f88671135b cleanup
michael
parents: 378
diff changeset
140 }else{
c1f88671135b cleanup
michael
parents: 378
diff changeset
141 st->codec.codec_type = CODEC_TYPE_VIDEO;
c1f88671135b cleanup
michael
parents: 378
diff changeset
142 switch(flags & 0xF){
c1f88671135b cleanup
michael
parents: 378
diff changeset
143 case 2: st->codec.codec_id = CODEC_ID_FLV1; break;
c1f88671135b cleanup
michael
parents: 378
diff changeset
144 default:
680
0f77a8b8f348 support adpcm audio, also some more verbose messages
alex
parents: 679
diff changeset
145 av_log(s, AV_LOG_INFO, "Unsupported video codec (%x)\n", flags & 0xf);
445
c1f88671135b cleanup
michael
parents: 378
diff changeset
146 st->codec.codec_tag= flags & 0xF;
c1f88671135b cleanup
michael
parents: 378
diff changeset
147 }
378
abd83fc30f0e guess framerate
michael
parents: 376
diff changeset
148 }
abd83fc30f0e guess framerate
michael
parents: 376
diff changeset
149
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
150 if (av_new_packet(pkt, size) < 0)
482
0fdc96c2f2fe sweeping change from -EIO -> AVERROR_IO
melanson
parents: 462
diff changeset
151 return AVERROR_IO;
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
152
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
153 ret = get_buffer(&s->pb, pkt->data, size);
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
154 if (ret <= 0) {
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
155 av_free_packet(pkt);
482
0fdc96c2f2fe sweeping change from -EIO -> AVERROR_IO
melanson
parents: 462
diff changeset
156 return AVERROR_IO;
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
157 }
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
158 /* 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
159 packet */
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
160 pkt->size = ret;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
161 pkt->pts = pts;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
162 pkt->stream_index = st->index;
568
256f7b271bdc report keyframes
alex
parents: 482
diff changeset
163
708
d79164865a7c more fine grained discarding of packets
michael
parents: 684
diff changeset
164 if (is_audio || ((flags >> 4)==1))
568
256f7b271bdc report keyframes
alex
parents: 482
diff changeset
165 pkt->flags |= PKT_FLAG_KEY;
256f7b271bdc report keyframes
alex
parents: 482
diff changeset
166
164
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
167 return ret;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
168 }
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
169
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
170 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
171 {
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
172 return 0;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
173 }
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
174
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
175 AVInputFormat flv_iformat = {
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
176 "flv",
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
177 "flv format",
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
178 0,
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
179 flv_probe,
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
180 flv_read_header,
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
181 flv_read_packet,
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
182 flv_read_close,
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
183 .extensions = "flv",
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
184 .value = CODEC_ID_FLV1,
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
185 };
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
186
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
187 int flvdec_init(void)
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
188 {
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
189 av_register_input_format(&flv_iformat);
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
190 return 0;
99fbacf0f764 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
diff changeset
191 }