annotate avidec.c @ 982:c21f07d85158 libavformat

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