annotate avidec.c @ 743:af4e24d6310c libavformat

switch to native time bases
author michael
date Sat, 30 Apr 2005 21:43:59 +0000
parents ff85dfd59176
children cdb845a57ae4
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1 /*
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
2 * AVI decoder.
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
3 * Copyright (c) 2001 Fabrice Bellard.
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
4 *
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
5 * This library is free software; you can redistribute it and/or
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
6 * modify it under the terms of the GNU Lesser General Public
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
7 * License as published by the Free Software Foundation; either
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
8 * version 2 of the License, or (at your option) any later version.
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
9 *
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
10 * This library is distributed in the hope that it will be useful,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
13 * Lesser General Public License for more details.
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
14 *
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
15 * You should have received a copy of the GNU Lesser General Public
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
16 * License along with this library; if not, write to the Free Software
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
17 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
18 */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
19 #include "avformat.h"
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
20 #include "avi.h"
262
f174d9c00bce * DV handling was streamlined for both muxing/demuxing and
romansh
parents: 227
diff changeset
21 #include "dv.h"
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
22
700
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
23 #undef NDEBUG
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
24 #include <assert.h>
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
25
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
26 //#define DEBUG
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
27 //#define DEBUG_SEEK
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
28
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
29 typedef struct AVIStream {
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
30 int64_t frame_offset; /* current frame (video) or byte (audio) counter
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
31 (used to compute the pts) */
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
32 int remaining;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
33 int packet_size;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
34
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
35 int scale;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
36 int rate;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
37 int sample_size; /* audio only data */
457
0f5aae2cd43f vbr audio fix
michael
parents: 344
diff changeset
38 int start;
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
39
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
40 int cum_len; /* temporary storage (used during seek) */
519
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
41
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
42 int prefix; ///< normally 'd'<<8 + 'c' or 'w'<<8 + 'b'
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
43 int prefix_count;
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
44 } AVIStream;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
45
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
46 typedef struct {
262
f174d9c00bce * DV handling was streamlined for both muxing/demuxing and
romansh
parents: 227
diff changeset
47 int64_t riff_end;
f174d9c00bce * DV handling was streamlined for both muxing/demuxing and
romansh
parents: 227
diff changeset
48 int64_t movi_end;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
49 offset_t movi_list;
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
50 int index_loaded;
510
133287132e1d * simplifying OpenDML AVI handling.
romansh
parents: 495
diff changeset
51 int is_odml;
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
52 int non_interleaved;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
53 int stream_index;
296
252946de6d3f * DV demuxer is now capable of decoding auxilary audio stream. So,
romansh
parents: 262
diff changeset
54 DVDemuxContext* dv_demux;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
55 } AVIContext;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
56
469
6a4cc19e8d9b exporting keyframe flags, fixes keyframe stuff with streamcopy
michael
parents: 466
diff changeset
57 static int avi_load_index(AVFormatContext *s);
6a4cc19e8d9b exporting keyframe flags, fixes keyframe stuff with streamcopy
michael
parents: 466
diff changeset
58
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
59 #ifdef DEBUG
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
60 static void print_tag(const char *str, unsigned int tag, int size)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
61 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
62 printf("%s: tag=%c%c%c%c size=0x%x\n",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
63 str, tag & 0xff,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
64 (tag >> 8) & 0xff,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
65 (tag >> 16) & 0xff,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
66 (tag >> 24) & 0xff,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
67 size);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
68 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
69 #endif
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
70
92
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
71 static int get_riff(AVIContext *avi, ByteIOContext *pb)
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
72 {
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
73 uint32_t tag;
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
74 /* check RIFF header */
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
75 tag = get_le32(pb);
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
76
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
77 if (tag != MKTAG('R', 'I', 'F', 'F'))
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
78 return -1;
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
79 avi->riff_end = get_le32(pb); /* RIFF chunk size */
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
80 avi->riff_end += url_ftell(pb); /* RIFF chunk end */
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
81 tag = get_le32(pb);
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
82 if (tag != MKTAG('A', 'V', 'I', ' ') && tag != MKTAG('A', 'V', 'I', 'X'))
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
83 return -1;
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
84
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
85 return 0;
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
86 }
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
87
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
88 static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
89 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
90 AVIContext *avi = s->priv_data;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
91 ByteIOContext *pb = &s->pb;
98
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
92 uint32_t tag, tag1, handler;
703
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
93 int codec_type, stream_index, frame_period, bit_rate;
188
6c9d6422a2f6 update duration and start_time - add av_new_stream() usage
bellard
parents: 149
diff changeset
94 unsigned int size, nb_frames;
6c9d6422a2f6 update duration and start_time - add av_new_stream() usage
bellard
parents: 149
diff changeset
95 int i, n;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
96 AVStream *st;
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
97 AVIStream *ast;
227
b0d2d719ae41 hacks to support Xan AVI files
tmmm
parents: 188
diff changeset
98 int xan_video = 0; /* hack to support Xan A/V */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
99
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
100 avi->stream_index= -1;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
101
92
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
102 if (get_riff(avi, pb) < 0)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
103 return -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
104
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
105 /* first list tag */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
106 stream_index = -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
107 codec_type = -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
108 frame_period = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
109 for(;;) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
110 if (url_feof(pb))
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
111 goto fail;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
112 tag = get_le32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
113 size = get_le32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
114 #ifdef DEBUG
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
115 print_tag("tag", tag, size);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
116 #endif
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
117
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
118 switch(tag) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
119 case MKTAG('L', 'I', 'S', 'T'):
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
120 /* ignored, except when start of video packets */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
121 tag1 = get_le32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
122 #ifdef DEBUG
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
123 print_tag("list", tag1, 0);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
124 #endif
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
125 if (tag1 == MKTAG('m', 'o', 'v', 'i')) {
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
126 avi->movi_list = url_ftell(pb) - 4;
495
d33ce0cfc81c play more broken files
michael
parents: 472
diff changeset
127 if(size) avi->movi_end = avi->movi_list + size;
d33ce0cfc81c play more broken files
michael
parents: 472
diff changeset
128 else avi->movi_end = url_filesize(url_fileno(pb));
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
129 #ifdef DEBUG
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
130 printf("movi end=%Lx\n", avi->movi_end);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
131 #endif
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
132 goto end_of_header;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
133 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
134 break;
510
133287132e1d * simplifying OpenDML AVI handling.
romansh
parents: 495
diff changeset
135 case MKTAG('d', 'm', 'l', 'h'):
133287132e1d * simplifying OpenDML AVI handling.
romansh
parents: 495
diff changeset
136 avi->is_odml = 1;
133287132e1d * simplifying OpenDML AVI handling.
romansh
parents: 495
diff changeset
137 url_fskip(pb, size + (size & 1));
133287132e1d * simplifying OpenDML AVI handling.
romansh
parents: 495
diff changeset
138 break;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
139 case MKTAG('a', 'v', 'i', 'h'):
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
140 /* avi header */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
141 /* using frame_period is bad idea */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
142 frame_period = get_le32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
143 bit_rate = get_le32(pb) * 8;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
144 url_fskip(pb, 4 * 4);
188
6c9d6422a2f6 update duration and start_time - add av_new_stream() usage
bellard
parents: 149
diff changeset
145 n = get_le32(pb);
6c9d6422a2f6 update duration and start_time - add av_new_stream() usage
bellard
parents: 149
diff changeset
146 for(i=0;i<n;i++) {
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
147 AVIStream *ast;
262
f174d9c00bce * DV handling was streamlined for both muxing/demuxing and
romansh
parents: 227
diff changeset
148 st = av_new_stream(s, i);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
149 if (!st)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
150 goto fail;
462
b69898ffc92a move time_base (pts_num/pts_den) from AVFormatContext -> AVStream
michael
parents: 457
diff changeset
151
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
152 ast = av_mallocz(sizeof(AVIStream));
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
153 if (!ast)
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
154 goto fail;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
155 st->priv_data = ast;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
156 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
157 url_fskip(pb, size - 7 * 4);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
158 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
159 case MKTAG('s', 't', 'r', 'h'):
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
160 /* stream header */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
161 stream_index++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
162 tag1 = get_le32(pb);
262
f174d9c00bce * DV handling was streamlined for both muxing/demuxing and
romansh
parents: 227
diff changeset
163 handler = get_le32(pb); /* codec tag */
471
8b7a8dccde70 skip subtitle streams instead of perishing
michael
parents: 469
diff changeset
164 #ifdef DEBUG
8b7a8dccde70 skip subtitle streams instead of perishing
michael
parents: 469
diff changeset
165 print_tag("strh", tag1, -1);
8b7a8dccde70 skip subtitle streams instead of perishing
michael
parents: 469
diff changeset
166 #endif
703
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
167 if(tag1 == MKTAG('i', 'a', 'v', 's') || tag1 == MKTAG('i', 'v', 'a', 's')){
262
f174d9c00bce * DV handling was streamlined for both muxing/demuxing and
romansh
parents: 227
diff changeset
168 /*
f174d9c00bce * DV handling was streamlined for both muxing/demuxing and
romansh
parents: 227
diff changeset
169 * After some consideration -- I don't think we
f174d9c00bce * DV handling was streamlined for both muxing/demuxing and
romansh
parents: 227
diff changeset
170 * have to support anything but DV in a type1 AVIs.
f174d9c00bce * DV handling was streamlined for both muxing/demuxing and
romansh
parents: 227
diff changeset
171 */
98
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
172 if (s->nb_streams != 1)
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
173 goto fail;
262
f174d9c00bce * DV handling was streamlined for both muxing/demuxing and
romansh
parents: 227
diff changeset
174
f174d9c00bce * DV handling was streamlined for both muxing/demuxing and
romansh
parents: 227
diff changeset
175 if (handler != MKTAG('d', 'v', 's', 'd') &&
f174d9c00bce * DV handling was streamlined for both muxing/demuxing and
romansh
parents: 227
diff changeset
176 handler != MKTAG('d', 'v', 'h', 'd') &&
f174d9c00bce * DV handling was streamlined for both muxing/demuxing and
romansh
parents: 227
diff changeset
177 handler != MKTAG('d', 'v', 's', 'l'))
f174d9c00bce * DV handling was streamlined for both muxing/demuxing and
romansh
parents: 227
diff changeset
178 goto fail;
296
252946de6d3f * DV demuxer is now capable of decoding auxilary audio stream. So,
romansh
parents: 262
diff changeset
179
526
c5743d66c5ca * fix for a DV regression introduced with the last round of avi_read_packet
romansh
parents: 520
diff changeset
180 ast = s->streams[0]->priv_data;
296
252946de6d3f * DV demuxer is now capable of decoding auxilary audio stream. So,
romansh
parents: 262
diff changeset
181 av_freep(&s->streams[0]->codec.extradata);
252946de6d3f * DV demuxer is now capable of decoding auxilary audio stream. So,
romansh
parents: 262
diff changeset
182 av_freep(&s->streams[0]);
252946de6d3f * DV demuxer is now capable of decoding auxilary audio stream. So,
romansh
parents: 262
diff changeset
183 s->nb_streams = 0;
252946de6d3f * DV demuxer is now capable of decoding auxilary audio stream. So,
romansh
parents: 262
diff changeset
184 avi->dv_demux = dv_init_demux(s);
262
f174d9c00bce * DV handling was streamlined for both muxing/demuxing and
romansh
parents: 227
diff changeset
185 if (!avi->dv_demux)
f174d9c00bce * DV handling was streamlined for both muxing/demuxing and
romansh
parents: 227
diff changeset
186 goto fail;
526
c5743d66c5ca * fix for a DV regression introduced with the last round of avi_read_packet
romansh
parents: 520
diff changeset
187 s->streams[0]->priv_data = ast;
c5743d66c5ca * fix for a DV regression introduced with the last round of avi_read_packet
romansh
parents: 520
diff changeset
188 url_fskip(pb, 3 * 4);
c5743d66c5ca * fix for a DV regression introduced with the last round of avi_read_packet
romansh
parents: 520
diff changeset
189 ast->scale = get_le32(pb);
c5743d66c5ca * fix for a DV regression introduced with the last round of avi_read_packet
romansh
parents: 520
diff changeset
190 ast->rate = get_le32(pb);
296
252946de6d3f * DV demuxer is now capable of decoding auxilary audio stream. So,
romansh
parents: 262
diff changeset
191 stream_index = s->nb_streams - 1;
526
c5743d66c5ca * fix for a DV regression introduced with the last round of avi_read_packet
romansh
parents: 520
diff changeset
192 url_fskip(pb, size - 7*4);
703
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
193 break;
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
194 }
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
195
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
196 if (stream_index >= s->nb_streams) {
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
197 url_fskip(pb, size - 8);
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
198 break;
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
199 }
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
200 st = s->streams[stream_index];
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
201 ast = st->priv_data;
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
202 st->codec.stream_codec_tag= handler;
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
203
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
204 get_le32(pb); /* flags */
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
205 get_le16(pb); /* priority */
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
206 get_le16(pb); /* language */
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
207 get_le32(pb); /* initial frame */
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
208 ast->scale = get_le32(pb);
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
209 ast->rate = get_le32(pb);
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
210 if(ast->scale && ast->rate){
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
211 }else if(frame_period){
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
212 ast->rate = 1000000;
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
213 ast->scale = frame_period;
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
214 }else{
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
215 ast->rate = 25;
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
216 ast->scale = 1;
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
217 }
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
218 av_set_pts_info(st, 64, ast->scale, ast->rate);
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
219
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
220 ast->start= get_le32(pb); /* start */
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
221 nb_frames = get_le32(pb);
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
222
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
223 st->start_time = 0;
743
af4e24d6310c switch to native time bases
michael
parents: 718
diff changeset
224 st->duration = nb_frames;
703
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
225 get_le32(pb); /* buffer size */
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
226 get_le32(pb); /* quality */
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
227 ast->sample_size = get_le32(pb); /* sample ssize */
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
228 // av_log(NULL, AV_LOG_DEBUG, "%d %d %d %d\n", ast->rate, ast->scale, ast->start, ast->sample_size);
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
229
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
230 switch(tag1) {
98
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
231 case MKTAG('v', 'i', 'd', 's'):
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
232 codec_type = CODEC_TYPE_VIDEO;
75
78bec272ce3a read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents: 73
diff changeset
233
703
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
234 ast->sample_size = 0;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
235 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
236 case MKTAG('a', 'u', 'd', 's'):
703
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
237 codec_type = CODEC_TYPE_AUDIO;
73
d40ddc73858a reversing not yet reversed changes from r1.7 -> r1.8 except the static/const stuff
michaelni
parents: 65
diff changeset
238 break;
471
8b7a8dccde70 skip subtitle streams instead of perishing
michael
parents: 469
diff changeset
239 case MKTAG('t', 'x', 't', 's'):
8b7a8dccde70 skip subtitle streams instead of perishing
michael
parents: 469
diff changeset
240 //FIXME
8b7a8dccde70 skip subtitle streams instead of perishing
michael
parents: 469
diff changeset
241 codec_type = CODEC_TYPE_DATA; //CODEC_TYPE_SUB ? FIXME
8b7a8dccde70 skip subtitle streams instead of perishing
michael
parents: 469
diff changeset
242 break;
534
3846c006af2b pads stream
michael
parents: 526
diff changeset
243 case MKTAG('p', 'a', 'd', 's'):
3846c006af2b pads stream
michael
parents: 526
diff changeset
244 codec_type = CODEC_TYPE_UNKNOWN;
3846c006af2b pads stream
michael
parents: 526
diff changeset
245 stream_index--;
3846c006af2b pads stream
michael
parents: 526
diff changeset
246 break;
73
d40ddc73858a reversing not yet reversed changes from r1.7 -> r1.8 except the static/const stuff
michaelni
parents: 65
diff changeset
247 default:
534
3846c006af2b pads stream
michael
parents: 526
diff changeset
248 av_log(s, AV_LOG_ERROR, "unknown stream type %X\n", tag1);
73
d40ddc73858a reversing not yet reversed changes from r1.7 -> r1.8 except the static/const stuff
michaelni
parents: 65
diff changeset
249 goto fail;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
250 }
703
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
251 url_fskip(pb, size - 12 * 4);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
252 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
253 case MKTAG('s', 't', 'r', 'f'):
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
254 /* stream header */
262
f174d9c00bce * DV handling was streamlined for both muxing/demuxing and
romansh
parents: 227
diff changeset
255 if (stream_index >= s->nb_streams || avi->dv_demux) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
256 url_fskip(pb, size);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
257 } else {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
258 st = s->streams[stream_index];
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
259 switch(codec_type) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
260 case CODEC_TYPE_VIDEO:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
261 get_le32(pb); /* size */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
262 st->codec.width = get_le32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
263 st->codec.height = get_le32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
264 get_le16(pb); /* panes */
75
78bec272ce3a read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents: 73
diff changeset
265 st->codec.bits_per_sample= get_le16(pb); /* depth */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
266 tag1 = get_le32(pb);
75
78bec272ce3a read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents: 73
diff changeset
267 get_le32(pb); /* ImageSize */
78bec272ce3a read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents: 73
diff changeset
268 get_le32(pb); /* XPelsPerMeter */
78bec272ce3a read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents: 73
diff changeset
269 get_le32(pb); /* YPelsPerMeter */
78bec272ce3a read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents: 73
diff changeset
270 get_le32(pb); /* ClrUsed */
78bec272ce3a read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents: 73
diff changeset
271 get_le32(pb); /* ClrImportant */
78bec272ce3a read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents: 73
diff changeset
272
639
0b52743104ac integer overflows, heap corruption
michael
parents: 621
diff changeset
273 if(size > 10*4 && size<(1<<30)){
75
78bec272ce3a read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents: 73
diff changeset
274 st->codec.extradata_size= size - 10*4;
587
fe24632a577b allocate a few bytes more for extradata so the bitstream reader if its used by the codec for parsing extardata, doesnt read over the end
michael
parents: 584
diff changeset
275 st->codec.extradata= av_malloc(st->codec.extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
75
78bec272ce3a read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents: 73
diff changeset
276 get_buffer(pb, st->codec.extradata, st->codec.extradata_size);
639
0b52743104ac integer overflows, heap corruption
michael
parents: 621
diff changeset
277 }
76
d03c70b7b50d huffyuv encoding fixed
michaelni
parents: 75
diff changeset
278
d03c70b7b50d huffyuv encoding fixed
michaelni
parents: 75
diff changeset
279 if(st->codec.extradata_size & 1) //FIXME check if the encoder really did this correctly
d03c70b7b50d huffyuv encoding fixed
michaelni
parents: 75
diff changeset
280 get_byte(pb);
75
78bec272ce3a read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents: 73
diff changeset
281
297
85d558a18134 Make avi and asf demuxer export palette in palctrl
rtognimp
parents: 296
diff changeset
282 /* Extract palette from extradata if bpp <= 8 */
85d558a18134 Make avi and asf demuxer export palette in palctrl
rtognimp
parents: 296
diff changeset
283 /* This code assumes that extradata contains only palette */
85d558a18134 Make avi and asf demuxer export palette in palctrl
rtognimp
parents: 296
diff changeset
284 /* This is true for all paletted codecs implemented in ffmpeg */
85d558a18134 Make avi and asf demuxer export palette in palctrl
rtognimp
parents: 296
diff changeset
285 if (st->codec.extradata_size && (st->codec.bits_per_sample <= 8)) {
85d558a18134 Make avi and asf demuxer export palette in palctrl
rtognimp
parents: 296
diff changeset
286 st->codec.palctrl = av_mallocz(sizeof(AVPaletteControl));
85d558a18134 Make avi and asf demuxer export palette in palctrl
rtognimp
parents: 296
diff changeset
287 #ifdef WORDS_BIGENDIAN
300
6ee1b02f9b2a * fixes for broken builds on Solaris, OS2 and all bingendian
romansh
parents: 297
diff changeset
288 for (i = 0; i < FFMIN(st->codec.extradata_size, AVPALETTE_SIZE)/4; i++)
6ee1b02f9b2a * fixes for broken builds on Solaris, OS2 and all bingendian
romansh
parents: 297
diff changeset
289 st->codec.palctrl->palette[i] = bswap_32(((uint32_t*)st->codec.extradata)[i]);
297
85d558a18134 Make avi and asf demuxer export palette in palctrl
rtognimp
parents: 296
diff changeset
290 #else
85d558a18134 Make avi and asf demuxer export palette in palctrl
rtognimp
parents: 296
diff changeset
291 memcpy(st->codec.palctrl->palette, st->codec.extradata,
85d558a18134 Make avi and asf demuxer export palette in palctrl
rtognimp
parents: 296
diff changeset
292 FFMIN(st->codec.extradata_size, AVPALETTE_SIZE));
85d558a18134 Make avi and asf demuxer export palette in palctrl
rtognimp
parents: 296
diff changeset
293 #endif
85d558a18134 Make avi and asf demuxer export palette in palctrl
rtognimp
parents: 296
diff changeset
294 st->codec.palctrl->palette_changed = 1;
85d558a18134 Make avi and asf demuxer export palette in palctrl
rtognimp
parents: 296
diff changeset
295 }
85d558a18134 Make avi and asf demuxer export palette in palctrl
rtognimp
parents: 296
diff changeset
296
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
297 #ifdef DEBUG
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
298 print_tag("video", tag1, 0);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
299 #endif
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
300 st->codec.codec_type = CODEC_TYPE_VIDEO;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
301 st->codec.codec_tag = tag1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
302 st->codec.codec_id = codec_get_id(codec_bmp_tags, tag1);
227
b0d2d719ae41 hacks to support Xan AVI files
tmmm
parents: 188
diff changeset
303 if (st->codec.codec_id == CODEC_ID_XAN_WC4)
b0d2d719ae41 hacks to support Xan AVI files
tmmm
parents: 188
diff changeset
304 xan_video = 1;
75
78bec272ce3a read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents: 73
diff changeset
305 // url_fskip(pb, size - 5 * 4);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
306 break;
73
d40ddc73858a reversing not yet reversed changes from r1.7 -> r1.8 except the static/const stuff
michaelni
parents: 65
diff changeset
307 case CODEC_TYPE_AUDIO:
84
0068a6902911 correct AUDIO strf parsing patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 82
diff changeset
308 get_wav_header(pb, &st->codec, size);
13
8a5285a0ca2f Fix for odd strf tag in Stargate SG-1 - 3x18 - Shades of Grey.avi
mmu_man
parents: 5
diff changeset
309 if (size%2) /* 2-aligned (fix for Stargate SG-1 - 3x18 - Shades of Grey.avi) */
8a5285a0ca2f Fix for odd strf tag in Stargate SG-1 - 3x18 - Shades of Grey.avi
mmu_man
parents: 5
diff changeset
310 url_fskip(pb, 1);
227
b0d2d719ae41 hacks to support Xan AVI files
tmmm
parents: 188
diff changeset
311 /* special case time: To support Xan DPCM, hardcode
b0d2d719ae41 hacks to support Xan AVI files
tmmm
parents: 188
diff changeset
312 * the format if Xxan is the video codec */
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
313 st->need_parsing = 1;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
314 /* force parsing as several audio frames can be in
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
315 one packet */
227
b0d2d719ae41 hacks to support Xan AVI files
tmmm
parents: 188
diff changeset
316 if (xan_video)
b0d2d719ae41 hacks to support Xan AVI files
tmmm
parents: 188
diff changeset
317 st->codec.codec_id = CODEC_ID_XAN_DPCM;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
318 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
319 default:
472
michael
parents: 471
diff changeset
320 st->codec.codec_type = CODEC_TYPE_DATA;
michael
parents: 471
diff changeset
321 st->codec.codec_id= CODEC_ID_NONE;
michael
parents: 471
diff changeset
322 st->codec.codec_tag= 0;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
323 url_fskip(pb, size);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
324 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
325 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
326 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
327 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
328 default:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
329 /* skip tag */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
330 size += (size & 1);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
331 url_fskip(pb, size);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
332 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
333 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
334 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
335 end_of_header:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
336 /* check stream number */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
337 if (stream_index != s->nb_streams - 1) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
338 fail:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
339 for(i=0;i<s->nb_streams;i++) {
80
michaelni
parents: 78
diff changeset
340 av_freep(&s->streams[i]->codec.extradata);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
341 av_freep(&s->streams[i]);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
342 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
343 return -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
344 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
345
469
6a4cc19e8d9b exporting keyframe flags, fixes keyframe stuff with streamcopy
michael
parents: 466
diff changeset
346 assert(!avi->index_loaded);
6a4cc19e8d9b exporting keyframe flags, fixes keyframe stuff with streamcopy
michael
parents: 466
diff changeset
347 avi_load_index(s);
6a4cc19e8d9b exporting keyframe flags, fixes keyframe stuff with streamcopy
michael
parents: 466
diff changeset
348 avi->index_loaded = 1;
6a4cc19e8d9b exporting keyframe flags, fixes keyframe stuff with streamcopy
michael
parents: 466
diff changeset
349
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
350 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
351 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
352
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
353 static int avi_read_packet(AVFormatContext *s, AVPacket *pkt)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
354 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
355 AVIContext *avi = s->priv_data;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
356 ByteIOContext *pb = &s->pb;
510
133287132e1d * simplifying OpenDML AVI handling.
romansh
parents: 495
diff changeset
357 int n, d[8], size;
569
aca10aa7686f fixing demuxing of vc2_intro.avi
michael
parents: 562
diff changeset
358 offset_t i, sync;
262
f174d9c00bce * DV handling was streamlined for both muxing/demuxing and
romansh
parents: 227
diff changeset
359 void* dstr;
f174d9c00bce * DV handling was streamlined for both muxing/demuxing and
romansh
parents: 227
diff changeset
360
f174d9c00bce * DV handling was streamlined for both muxing/demuxing and
romansh
parents: 227
diff changeset
361 if (avi->dv_demux) {
f174d9c00bce * DV handling was streamlined for both muxing/demuxing and
romansh
parents: 227
diff changeset
362 size = dv_get_packet(avi->dv_demux, pkt);
f174d9c00bce * DV handling was streamlined for both muxing/demuxing and
romansh
parents: 227
diff changeset
363 if (size >= 0)
f174d9c00bce * DV handling was streamlined for both muxing/demuxing and
romansh
parents: 227
diff changeset
364 return size;
149
f4de8f9c39bd use custom packet allocation only for DV
bellard
parents: 119
diff changeset
365 }
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
366
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
367 if(avi->non_interleaved){
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
368 int best_stream_index;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
369 AVStream *best_st= NULL;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
370 AVIStream *best_ast;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
371 int64_t best_ts= INT64_MAX;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
372 int i;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
373
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
374 for(i=0; i<s->nb_streams; i++){
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
375 AVStream *st = s->streams[i];
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
376 AVIStream *ast = st->priv_data;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
377 int64_t ts= ast->frame_offset;
569
aca10aa7686f fixing demuxing of vc2_intro.avi
michael
parents: 562
diff changeset
378
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
379 if(ast->sample_size)
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
380 ts /= ast->sample_size;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
381 ts= av_rescale(ts, AV_TIME_BASE * (int64_t)st->time_base.num, st->time_base.den);
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
382
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
383 // av_log(NULL, AV_LOG_DEBUG, "%Ld %d/%d %Ld\n", ts, st->time_base.num, st->time_base.den, ast->frame_offset);
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
384 if(ts < best_ts){
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
385 best_ts= ts;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
386 best_st= st;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
387 best_stream_index= i;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
388 }
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
389 }
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
390 best_ast = best_st->priv_data;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
391 best_ts= av_rescale(best_ts, best_st->time_base.den, AV_TIME_BASE * (int64_t)best_st->time_base.num); //FIXME a little ugly
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
392 if(best_ast->remaining)
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
393 i= av_index_search_timestamp(best_st, best_ts, AVSEEK_FLAG_ANY | AVSEEK_FLAG_BACKWARD);
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
394 else
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
395 i= av_index_search_timestamp(best_st, best_ts, AVSEEK_FLAG_ANY);
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
396
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
397 // av_log(NULL, AV_LOG_DEBUG, "%d\n", i);
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
398 if(i>=0){
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
399 int64_t pos= best_st->index_entries[i].pos;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
400 pos += avi->movi_list + best_ast->packet_size - best_ast->remaining;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
401 url_fseek(&s->pb, pos, SEEK_SET);
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
402 // av_log(NULL, AV_LOG_DEBUG, "pos=%Ld\n", pos);
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
403
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
404 if(best_ast->remaining)
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
405 avi->stream_index= best_stream_index;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
406 else
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
407 avi->stream_index= -1;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
408 }
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
409 }
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
410
569
aca10aa7686f fixing demuxing of vc2_intro.avi
michael
parents: 562
diff changeset
411 resync:
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
412 if(avi->stream_index >= 0){
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
413 AVStream *st= s->streams[ avi->stream_index ];
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
414 AVIStream *ast= st->priv_data;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
415 int size;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
416
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
417 if(ast->sample_size == 0)
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
418 size= INT_MAX;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
419 else if(ast->sample_size < 32)
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
420 size= 64*ast->sample_size;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
421 else
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
422 size= ast->sample_size;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
423
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
424 if(size > ast->remaining)
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
425 size= ast->remaining;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
426 av_new_packet(pkt, size);
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
427 get_buffer(pb, pkt->data, size);
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
428
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
429 if (avi->dv_demux) {
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
430 dstr = pkt->destruct;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
431 size = dv_produce_packet(avi->dv_demux, pkt,
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
432 pkt->data, pkt->size);
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
433 pkt->destruct = dstr;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
434 pkt->flags |= PKT_FLAG_KEY;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
435 } else {
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
436 /* XXX: how to handle B frames in avi ? */
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
437 pkt->dts = ast->frame_offset;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
438 // pkt->dts += ast->start;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
439 if(ast->sample_size)
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
440 pkt->dts /= ast->sample_size;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
441 //av_log(NULL, AV_LOG_DEBUG, "dts:%Ld offset:%d %d/%d smpl_siz:%d base:%d st:%d size:%d\n", pkt->dts, ast->frame_offset, ast->scale, ast->rate, ast->sample_size, AV_TIME_BASE, n, size);
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
442 pkt->stream_index = avi->stream_index;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
443
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
444 if (st->codec.codec_type == CODEC_TYPE_VIDEO) {
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
445 if(st->index_entries){
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
446 AVIndexEntry *e;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
447 int index;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
448
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
449 index= av_index_search_timestamp(st, pkt->dts, 0);
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
450 e= &st->index_entries[index];
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
451
718
ff85dfd59176 segfault fix
michael
parents: 708
diff changeset
452 if(index >= 0 && e->timestamp == ast->frame_offset){
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
453 if (e->flags & AVINDEX_KEYFRAME)
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
454 pkt->flags |= PKT_FLAG_KEY;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
455 }
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
456 } else {
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
457 /* if no index, better to say that all frames
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
458 are key frames */
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
459 pkt->flags |= PKT_FLAG_KEY;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
460 }
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
461 } else {
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
462 pkt->flags |= PKT_FLAG_KEY;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
463 }
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
464 if(ast->sample_size)
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
465 ast->frame_offset += pkt->size;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
466 else
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
467 ast->frame_offset++;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
468 }
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
469 ast->remaining -= size;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
470 if(!ast->remaining){
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
471 avi->stream_index= -1;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
472 ast->packet_size= 0;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
473 if (size & 1) {
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
474 get_byte(pb);
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
475 size++;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
476 }
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
477 }
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
478
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
479 return size;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
480 }
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
481
569
aca10aa7686f fixing demuxing of vc2_intro.avi
michael
parents: 562
diff changeset
482 memset(d, -1, sizeof(int)*8);
aca10aa7686f fixing demuxing of vc2_intro.avi
michael
parents: 562
diff changeset
483 for(i=sync=url_ftell(pb); !url_feof(pb); i++) {
82
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
484 int j;
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
485
510
133287132e1d * simplifying OpenDML AVI handling.
romansh
parents: 495
diff changeset
486 if (i >= avi->movi_end) {
133287132e1d * simplifying OpenDML AVI handling.
romansh
parents: 495
diff changeset
487 if (avi->is_odml) {
133287132e1d * simplifying OpenDML AVI handling.
romansh
parents: 495
diff changeset
488 url_fskip(pb, avi->riff_end - i);
133287132e1d * simplifying OpenDML AVI handling.
romansh
parents: 495
diff changeset
489 avi->riff_end = avi->movi_end = url_filesize(url_fileno(pb));
133287132e1d * simplifying OpenDML AVI handling.
romansh
parents: 495
diff changeset
490 } else
133287132e1d * simplifying OpenDML AVI handling.
romansh
parents: 495
diff changeset
491 break;
92
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
492 }
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
493
82
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
494 for(j=0; j<7; j++)
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
495 d[j]= d[j+1];
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
496 d[7]= get_byte(pb);
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
497
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
498 size= d[4] + (d[5]<<8) + (d[6]<<16) + (d[7]<<24);
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
499
519
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
500 if( d[2] >= '0' && d[2] <= '9'
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
501 && d[3] >= '0' && d[3] <= '9'){
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
502 n= (d[2] - '0') * 10 + (d[3] - '0');
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
503 }else{
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
504 n= 100; //invalid stream id
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
505 }
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
506 //av_log(NULL, AV_LOG_DEBUG, "%X %X %X %X %X %X %X %X %lld %d %d\n", d[0], d[1], d[2], d[3], d[4], d[5], d[6], d[7], i, size, n);
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
507 if(i + size > avi->movi_end || d[0]<0)
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
508 continue;
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
509
82
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
510 //parse ix##
519
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
511 if( (d[0] == 'i' && d[1] == 'x' && n < s->nb_streams)
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
512 //parse JUNK
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
513 ||(d[0] == 'J' && d[1] == 'U' && d[2] == 'N' && d[3] == 'K')){
82
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
514 url_fskip(pb, size);
519
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
515 //av_log(NULL, AV_LOG_DEBUG, "SKIP\n");
569
aca10aa7686f fixing demuxing of vc2_intro.avi
michael
parents: 562
diff changeset
516 goto resync;
82
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
517 }
510
133287132e1d * simplifying OpenDML AVI handling.
romansh
parents: 495
diff changeset
518
519
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
519 if( d[0] >= '0' && d[0] <= '9'
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
520 && d[1] >= '0' && d[1] <= '9'){
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
521 n= (d[0] - '0') * 10 + (d[1] - '0');
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
522 }else{
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
523 n= 100; //invalid stream id
510
133287132e1d * simplifying OpenDML AVI handling.
romansh
parents: 495
diff changeset
524 }
82
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
525
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
526 //parse ##dc/##wb
705
594a9b0cacf5 reverse zero packet dissapearence "feature"
michael
parents: 703
diff changeset
527 if(n < s->nb_streams){
519
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
528 AVStream *st;
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
529 AVIStream *ast;
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
530 st = s->streams[n];
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
531 ast = st->priv_data;
650
c129846f7f02 support discarding of uninterresting packets
michael
parents: 649
diff changeset
532
708
d79164865a7c more fine grained discarding of packets
michael
parents: 705
diff changeset
533 if( (st->discard >= AVDISCARD_DEFAULT && size==0)
d79164865a7c more fine grained discarding of packets
michael
parents: 705
diff changeset
534 /*|| (st->discard >= AVDISCARD_NONKEY && !(pkt->flags & PKT_FLAG_KEY))*/ //FIXME needs a little reordering
d79164865a7c more fine grained discarding of packets
michael
parents: 705
diff changeset
535 || st->discard >= AVDISCARD_ALL){
d79164865a7c more fine grained discarding of packets
michael
parents: 705
diff changeset
536 if(ast->sample_size) ast->frame_offset += pkt->size;
d79164865a7c more fine grained discarding of packets
michael
parents: 705
diff changeset
537 else ast->frame_offset++;
650
c129846f7f02 support discarding of uninterresting packets
michael
parents: 649
diff changeset
538 url_fskip(pb, size);
c129846f7f02 support discarding of uninterresting packets
michael
parents: 649
diff changeset
539 goto resync;
c129846f7f02 support discarding of uninterresting packets
michael
parents: 649
diff changeset
540 }
519
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
541
569
aca10aa7686f fixing demuxing of vc2_intro.avi
michael
parents: 562
diff changeset
542 if( ((ast->prefix_count<5 || sync+9 > i) && d[2]<128 && d[3]<128) ||
519
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
543 d[2]*256+d[3] == ast->prefix /*||
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
544 (d[2] == 'd' && d[3] == 'c') ||
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
545 (d[2] == 'w' && d[3] == 'b')*/) {
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
546
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
547 //av_log(NULL, AV_LOG_DEBUG, "OK\n");
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
548 if(d[2]*256+d[3] == ast->prefix)
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
549 ast->prefix_count++;
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
550 else{
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
551 ast->prefix= d[2]*256+d[3];
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
552 ast->prefix_count= 0;
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
553 }
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
554
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
555 avi->stream_index= n;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
556 ast->packet_size= size + 8;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
557 ast->remaining= size;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
558 goto resync;
519
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
559 }
82
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
560 }
520
5d96fe8f6560 added support for the elusive AVI palette change chunk, courtesy of
melanson
parents: 519
diff changeset
561 /* palette changed chunk */
5d96fe8f6560 added support for the elusive AVI palette change chunk, courtesy of
melanson
parents: 519
diff changeset
562 if ( d[0] >= '0' && d[0] <= '9'
5d96fe8f6560 added support for the elusive AVI palette change chunk, courtesy of
melanson
parents: 519
diff changeset
563 && d[1] >= '0' && d[1] <= '9'
5d96fe8f6560 added support for the elusive AVI palette change chunk, courtesy of
melanson
parents: 519
diff changeset
564 && ((d[2] == 'p' && d[3] == 'c'))
5d96fe8f6560 added support for the elusive AVI palette change chunk, courtesy of
melanson
parents: 519
diff changeset
565 && n < s->nb_streams && i + size <= avi->movi_end) {
5d96fe8f6560 added support for the elusive AVI palette change chunk, courtesy of
melanson
parents: 519
diff changeset
566
5d96fe8f6560 added support for the elusive AVI palette change chunk, courtesy of
melanson
parents: 519
diff changeset
567 AVStream *st;
5d96fe8f6560 added support for the elusive AVI palette change chunk, courtesy of
melanson
parents: 519
diff changeset
568 int first, clr, flags, k, p;
5d96fe8f6560 added support for the elusive AVI palette change chunk, courtesy of
melanson
parents: 519
diff changeset
569
5d96fe8f6560 added support for the elusive AVI palette change chunk, courtesy of
melanson
parents: 519
diff changeset
570 st = s->streams[n];
5d96fe8f6560 added support for the elusive AVI palette change chunk, courtesy of
melanson
parents: 519
diff changeset
571
5d96fe8f6560 added support for the elusive AVI palette change chunk, courtesy of
melanson
parents: 519
diff changeset
572 first = get_byte(pb);
5d96fe8f6560 added support for the elusive AVI palette change chunk, courtesy of
melanson
parents: 519
diff changeset
573 clr = get_byte(pb);
584
4e3bab6555ae When playing
michael
parents: 569
diff changeset
574 if(!clr) /* all 256 colors used */
4e3bab6555ae When playing
michael
parents: 569
diff changeset
575 clr = 256;
520
5d96fe8f6560 added support for the elusive AVI palette change chunk, courtesy of
melanson
parents: 519
diff changeset
576 flags = get_le16(pb);
5d96fe8f6560 added support for the elusive AVI palette change chunk, courtesy of
melanson
parents: 519
diff changeset
577 p = 4;
5d96fe8f6560 added support for the elusive AVI palette change chunk, courtesy of
melanson
parents: 519
diff changeset
578 for (k = first; k < clr + first; k++) {
5d96fe8f6560 added support for the elusive AVI palette change chunk, courtesy of
melanson
parents: 519
diff changeset
579 int r, g, b;
5d96fe8f6560 added support for the elusive AVI palette change chunk, courtesy of
melanson
parents: 519
diff changeset
580 r = get_byte(pb);
5d96fe8f6560 added support for the elusive AVI palette change chunk, courtesy of
melanson
parents: 519
diff changeset
581 g = get_byte(pb);
5d96fe8f6560 added support for the elusive AVI palette change chunk, courtesy of
melanson
parents: 519
diff changeset
582 b = get_byte(pb);
5d96fe8f6560 added support for the elusive AVI palette change chunk, courtesy of
melanson
parents: 519
diff changeset
583 get_byte(pb);
5d96fe8f6560 added support for the elusive AVI palette change chunk, courtesy of
melanson
parents: 519
diff changeset
584 st->codec.palctrl->palette[k] = b + (g << 8) + (r << 16);
5d96fe8f6560 added support for the elusive AVI palette change chunk, courtesy of
melanson
parents: 519
diff changeset
585 }
5d96fe8f6560 added support for the elusive AVI palette change chunk, courtesy of
melanson
parents: 519
diff changeset
586 st->codec.palctrl->palette_changed = 1;
569
aca10aa7686f fixing demuxing of vc2_intro.avi
michael
parents: 562
diff changeset
587 goto resync;
520
5d96fe8f6560 added support for the elusive AVI palette change chunk, courtesy of
melanson
parents: 519
diff changeset
588 }
5d96fe8f6560 added support for the elusive AVI palette change chunk, courtesy of
melanson
parents: 519
diff changeset
589
82
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
590 }
519
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
591
82
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
592 return -1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
593 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
594
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
595 /* XXX: we make the implicit supposition that the position are sorted
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
596 for each stream */
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
597 static int avi_read_idx1(AVFormatContext *s, int size)
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
598 {
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
599 AVIContext *avi = s->priv_data;
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
600 ByteIOContext *pb = &s->pb;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
601 int nb_index_entries, i;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
602 AVStream *st;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
603 AVIStream *ast;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
604 unsigned int index, tag, flags, pos, len;
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
605 unsigned last_pos= -1;
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
606
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
607 nb_index_entries = size / 16;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
608 if (nb_index_entries <= 0)
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
609 return -1;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
610
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
611 /* read the entries and sort them in each stream component */
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
612 for(i = 0; i < nb_index_entries; i++) {
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
613 tag = get_le32(pb);
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
614 flags = get_le32(pb);
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
615 pos = get_le32(pb);
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
616 len = get_le32(pb);
700
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
617 #if defined(DEBUG_SEEK)
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
618 av_log(NULL, AV_LOG_DEBUG, "%d: tag=0x%x flags=0x%x pos=0x%x len=%d/",
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
619 i, tag, flags, pos, len);
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
620 #endif
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
621 if(i==0 && pos > avi->movi_list)
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
622 avi->movi_list= 0; //FIXME better check
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
623
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
624 index = ((tag & 0xff) - '0') * 10;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
625 index += ((tag >> 8) & 0xff) - '0';
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
626 if (index >= s->nb_streams)
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
627 continue;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
628 st = s->streams[index];
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
629 ast = st->priv_data;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
630
700
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
631 #if defined(DEBUG_SEEK)
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
632 av_log(NULL, AV_LOG_DEBUG, "%d cum_len=%d\n", len, ast->cum_len);
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
633 #endif
705
594a9b0cacf5 reverse zero packet dissapearence "feature"
michael
parents: 703
diff changeset
634 if(last_pos == pos)
594a9b0cacf5 reverse zero packet dissapearence "feature"
michael
parents: 703
diff changeset
635 avi->non_interleaved= 1;
594a9b0cacf5 reverse zero packet dissapearence "feature"
michael
parents: 703
diff changeset
636 else
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
637 av_add_index_entry(st, pos, ast->cum_len, 0, (flags&AVIIF_INDEX) ? AVINDEX_KEYFRAME : 0);
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
638 if(ast->sample_size)
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
639 ast->cum_len += len / ast->sample_size;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
640 else
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
641 ast->cum_len ++;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
642 last_pos= pos;
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
643 }
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
644 return 0;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
645 }
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
646
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
647 static int guess_ni_flag(AVFormatContext *s){
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
648 AVIContext *avi = s->priv_data;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
649 int i;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
650 int64_t last_start=0;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
651 int64_t first_end= INT64_MAX;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
652
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
653 for(i=0; i<s->nb_streams; i++){
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
654 AVStream *st = s->streams[i];
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
655 AVIStream *ast = st->priv_data;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
656 int n= st->nb_index_entries;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
657
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
658 if(n <= 0)
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
659 continue;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
660
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
661 if(st->index_entries[0].pos > last_start)
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
662 last_start= st->index_entries[0].pos;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
663 if(st->index_entries[n-1].pos < first_end)
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
664 first_end= st->index_entries[n-1].pos;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
665 }
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
666 return last_start > first_end;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
667 }
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
668
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
669 static int avi_load_index(AVFormatContext *s)
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
670 {
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
671 AVIContext *avi = s->priv_data;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
672 ByteIOContext *pb = &s->pb;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
673 uint32_t tag, size;
343
538e6791f4c7 fixing some seek failure issues
michael
parents: 340
diff changeset
674 offset_t pos= url_ftell(pb);
538e6791f4c7 fixing some seek failure issues
michael
parents: 340
diff changeset
675
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
676 url_fseek(pb, avi->movi_end, SEEK_SET);
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
677 #ifdef DEBUG_SEEK
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
678 printf("movi_end=0x%llx\n", avi->movi_end);
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
679 #endif
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
680 for(;;) {
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
681 if (url_feof(pb))
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
682 break;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
683 tag = get_le32(pb);
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
684 size = get_le32(pb);
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
685 #ifdef DEBUG_SEEK
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
686 printf("tag=%c%c%c%c size=0x%x\n",
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
687 tag & 0xff,
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
688 (tag >> 8) & 0xff,
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
689 (tag >> 16) & 0xff,
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
690 (tag >> 24) & 0xff,
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
691 size);
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
692 #endif
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
693 switch(tag) {
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
694 case MKTAG('i', 'd', 'x', '1'):
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
695 if (avi_read_idx1(s, size) < 0)
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
696 goto skip;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
697 else
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
698 goto the_end;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
699 break;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
700 default:
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
701 skip:
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
702 size += (size & 1);
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
703 url_fskip(pb, size);
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
704 break;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
705 }
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
706 }
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
707 the_end:
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
708 avi->non_interleaved |= guess_ni_flag(s);
343
538e6791f4c7 fixing some seek failure issues
michael
parents: 340
diff changeset
709 url_fseek(pb, pos, SEEK_SET);
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
710 return 0;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
711 }
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
712
558
89bd76208427 100l (forgoten seeking functions)
michael
parents: 534
diff changeset
713 static int avi_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp, int flags)
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
714 {
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
715 AVIContext *avi = s->priv_data;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
716 AVStream *st;
700
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
717 int i, index;
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
718 int64_t pos;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
719
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
720 if (!avi->index_loaded) {
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
721 /* we only load the index on demand */
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
722 avi_load_index(s);
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
723 avi->index_loaded = 1;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
724 }
700
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
725 assert(stream_index>= 0);
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
726
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
727 st = s->streams[stream_index];
700
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
728 index= av_index_search_timestamp(st, timestamp, flags);
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
729 if(index<0)
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
730 return -1;
700
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
731
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
732 /* find the position */
700
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
733 pos = st->index_entries[index].pos;
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
734 timestamp = st->index_entries[index].timestamp;
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
735
700
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
736 // av_log(NULL, AV_LOG_DEBUG, "XX %Ld %d %Ld\n", timestamp, index, st->index_entries[index].timestamp);
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
737
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
738 for(i = 0; i < s->nb_streams; i++) {
700
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
739 AVStream *st2 = s->streams[i];
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
740 AVIStream *ast2 = st2->priv_data;
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
741
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
742 ast2->packet_size=
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
743 ast2->remaining= 0;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
744
700
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
745 if (st2->nb_index_entries <= 0)
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
746 continue;
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
747
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
748 // assert(st2->codec.block_align);
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
749 assert(st2->time_base.den == ast2->rate);
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
750 assert(st2->time_base.num == ast2->scale);
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
751 index = av_index_search_timestamp(
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
752 st2,
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
753 av_rescale(timestamp, st2->time_base.den*(int64_t)st->time_base.num, st->time_base.den * (int64_t)st2->time_base.num),
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
754 flags | AVSEEK_FLAG_BACKWARD);
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
755 if(index<0)
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
756 index=0;
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
757
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
758 if(!avi->non_interleaved){
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
759 while(index>0 && st2->index_entries[index].pos > pos)
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
760 index--;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
761 while(index+1 < st2->nb_index_entries && st2->index_entries[index].pos < pos)
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
762 index++;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
763 }
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
764
700
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
765 // av_log(NULL, AV_LOG_DEBUG, "%Ld %d %Ld\n", timestamp, index, st2->index_entries[index].timestamp);
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
766 /* extract the current frame number */
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
767 ast2->frame_offset = st2->index_entries[index].timestamp;
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
768 if(ast2->sample_size)
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
769 ast2->frame_offset *=ast2->sample_size;
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
770 }
700
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
771
562
bf3231dd1d7c * static allocation for audio packets. This will make it a little bit
romansh
parents: 558
diff changeset
772 if (avi->dv_demux)
bf3231dd1d7c * static allocation for audio packets. This will make it a little bit
romansh
parents: 558
diff changeset
773 dv_flush_audio_packets(avi->dv_demux);
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
774 /* do the seek */
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
775 pos += avi->movi_list;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
776 url_fseek(&s->pb, pos, SEEK_SET);
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
777 avi->stream_index= -1;
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
778 return 0;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
779 }
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
780
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
781 static int avi_read_close(AVFormatContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
782 {
110
9fd9b0f9e9d8 memleaks
michaelni
parents: 98
diff changeset
783 int i;
9fd9b0f9e9d8 memleaks
michaelni
parents: 98
diff changeset
784 AVIContext *avi = s->priv_data;
9fd9b0f9e9d8 memleaks
michaelni
parents: 98
diff changeset
785
9fd9b0f9e9d8 memleaks
michaelni
parents: 98
diff changeset
786 for(i=0;i<s->nb_streams;i++) {
9fd9b0f9e9d8 memleaks
michaelni
parents: 98
diff changeset
787 AVStream *st = s->streams[i];
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
788 AVIStream *ast = st->priv_data;
700
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
789 av_free(ast);
110
9fd9b0f9e9d8 memleaks
michaelni
parents: 98
diff changeset
790 av_free(st->codec.extradata);
297
85d558a18134 Make avi and asf demuxer export palette in palctrl
rtognimp
parents: 296
diff changeset
791 av_free(st->codec.palctrl);
110
9fd9b0f9e9d8 memleaks
michaelni
parents: 98
diff changeset
792 }
9fd9b0f9e9d8 memleaks
michaelni
parents: 98
diff changeset
793
262
f174d9c00bce * DV handling was streamlined for both muxing/demuxing and
romansh
parents: 227
diff changeset
794 if (avi->dv_demux)
f174d9c00bce * DV handling was streamlined for both muxing/demuxing and
romansh
parents: 227
diff changeset
795 av_free(avi->dv_demux);
f174d9c00bce * DV handling was streamlined for both muxing/demuxing and
romansh
parents: 227
diff changeset
796
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
797 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
798 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
799
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
800 static int avi_probe(AVProbeData *p)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
801 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
802 /* check file header */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
803 if (p->buf_size <= 32)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
804 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
805 if (p->buf[0] == 'R' && p->buf[1] == 'I' &&
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
806 p->buf[2] == 'F' && p->buf[3] == 'F' &&
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
807 p->buf[8] == 'A' && p->buf[9] == 'V' &&
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
808 p->buf[10] == 'I' && p->buf[11] == ' ')
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
809 return AVPROBE_SCORE_MAX;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
810 else
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
811 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
812 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
813
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
814 static AVInputFormat avi_iformat = {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
815 "avi",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
816 "avi format",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
817 sizeof(AVIContext),
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
818 avi_probe,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
819 avi_read_header,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
820 avi_read_packet,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
821 avi_read_close,
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
822 avi_read_seek,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
823 };
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
824
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
825 int avidec_init(void)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
826 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
827 av_register_input_format(&avi_iformat);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
828 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
829 }