annotate avidec.c @ 1970:a27976be3394 libavformat

Do not return invalid pointer for non-audio or video streams. Patch by Sam Hocevar sam+ffmpeg zoy org
author rtogni
date Fri, 30 Mar 2007 23:04:45 +0000
parents 1cbd1d658165
children 1a3c9056982a
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1 /*
1415
3b00fb8ef8e4 replace coder/decoder file description in libavformat by muxer/demuxer
aurel
parents: 1358
diff changeset
2 * AVI demuxer
0
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 *
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1298
diff changeset
5 * This file is part of FFmpeg.
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1298
diff changeset
6 *
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1298
diff changeset
7 * FFmpeg is free software; you can redistribute it and/or
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
8 * modify it under the terms of the GNU Lesser General Public
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
9 * License as published by the Free Software Foundation; either
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1298
diff changeset
10 * version 2.1 of the License, or (at your option) any later version.
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
11 *
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1298
diff changeset
12 * FFmpeg is distributed in the hope that it will be useful,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
15 * Lesser General Public License for more details.
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
16 *
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
17 * You should have received a copy of the GNU Lesser General Public
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1298
diff changeset
18 * License along with FFmpeg; if not, write to the Free Software
896
edbe5c3717f9 Update licensing information: The FSF changed postal address.
diego
parents: 887
diff changeset
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
20 */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
21 #include "avformat.h"
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
22 #include "avi.h"
262
f174d9c00bce * DV handling was streamlined for both muxing/demuxing and
romansh
parents: 227
diff changeset
23 #include "dv.h"
1172
6a5e58d2114b move common stuff from avienc.c and wav.c to new file riff.c
mru
parents: 1169
diff changeset
24 #include "riff.h"
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
25
700
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
26 #undef NDEBUG
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
27 #include <assert.h>
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
28
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
29 //#define DEBUG
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
30 //#define DEBUG_SEEK
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
31
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
32 typedef struct AVIStream {
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
33 int64_t frame_offset; /* current frame (video) or byte (audio) counter
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
34 (used to compute the pts) */
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
35 int remaining;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
36 int packet_size;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
37
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
38 int scale;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
39 int rate;
982
c21f07d85158 10l forgot to set packet_size
michael
parents: 981
diff changeset
40 int sample_size; /* size of one sample (or packet) (in the rate/scale sense) in bytes */
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
41
977
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
42 int64_t cum_len; /* temporary storage (used during seek) */
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
43
519
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
44 int prefix; ///< normally 'd'<<8 + 'c' or 'w'<<8 + 'b'
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
45 int prefix_count;
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
46 } AVIStream;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
47
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
48 typedef struct {
262
f174d9c00bce * DV handling was streamlined for both muxing/demuxing and
romansh
parents: 227
diff changeset
49 int64_t riff_end;
f174d9c00bce * DV handling was streamlined for both muxing/demuxing and
romansh
parents: 227
diff changeset
50 int64_t movi_end;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
51 offset_t movi_list;
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
52 int index_loaded;
510
133287132e1d * simplifying OpenDML AVI handling.
romansh
parents: 495
diff changeset
53 int is_odml;
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
54 int non_interleaved;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
55 int stream_index;
296
252946de6d3f * DV demuxer is now capable of decoding auxilary audio stream. So,
romansh
parents: 262
diff changeset
56 DVDemuxContext* dv_demux;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
57 } AVIContext;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
58
469
6a4cc19e8d9b exporting keyframe flags, fixes keyframe stuff with streamcopy
michael
parents: 466
diff changeset
59 static int avi_load_index(AVFormatContext *s);
979
d2e5dfdf4def add size to AVIndex
michael
parents: 977
diff changeset
60 static int guess_ni_flag(AVFormatContext *s);
469
6a4cc19e8d9b exporting keyframe flags, fixes keyframe stuff with streamcopy
michael
parents: 466
diff changeset
61
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
62 #ifdef DEBUG
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
63 static void print_tag(const char *str, unsigned int tag, int size)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
64 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
65 printf("%s: tag=%c%c%c%c size=0x%x\n",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
66 str, tag & 0xff,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
67 (tag >> 8) & 0xff,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
68 (tag >> 16) & 0xff,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
69 (tag >> 24) & 0xff,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
70 size);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
71 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
72 #endif
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
73
92
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
74 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
75 {
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
76 uint32_t tag;
92
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
77 /* check RIFF header */
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
78 tag = get_le32(pb);
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
79
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
80 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
81 return -1;
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
82 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
83 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
84 tag = get_le32(pb);
1761
e9bff647e326 supporting files with A,V,I,0x19 header
michael
parents: 1758
diff changeset
85 if(tag == MKTAG('A', 'V', 'I', 0x19))
e9bff647e326 supporting files with A,V,I,0x19 header
michael
parents: 1758
diff changeset
86 av_log(NULL, AV_LOG_INFO, "file has been generated with a totally broken muxer\n");
e9bff647e326 supporting files with A,V,I,0x19 header
michael
parents: 1758
diff changeset
87 else
92
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
88 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
89 return -1;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
90
92
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
91 return 0;
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
92 }
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
93
977
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
94 static int read_braindead_odml_indx(AVFormatContext *s, int frame_num){
984
b644fe79f7a2 fixing av sync in videotest.avi (index doesnt match chunks, header doesnt indicate that)
michael
parents: 983
diff changeset
95 AVIContext *avi = s->priv_data;
977
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
96 ByteIOContext *pb = &s->pb;
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
97 int longs_pre_entry= get_le16(pb);
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
98 int index_sub_type = get_byte(pb);
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
99 int index_type = get_byte(pb);
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
100 int entries_in_use = get_le32(pb);
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
101 int chunk_id = get_le32(pb);
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
102 int64_t base = get_le64(pb);
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
103 int stream_id= 10*((chunk_id&0xFF) - '0') + (((chunk_id>>8)&0xFF) - '0');
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
104 AVStream *st;
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
105 AVIStream *ast;
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
106 int i;
984
b644fe79f7a2 fixing av sync in videotest.avi (index doesnt match chunks, header doesnt indicate that)
michael
parents: 983
diff changeset
107 int64_t last_pos= -1;
1277
e27e94ac0c4b support some totally broken ODML variant
michael
parents: 1256
diff changeset
108 int64_t filesize= url_fsize(&s->pb);
977
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
109
1277
e27e94ac0c4b support some totally broken ODML variant
michael
parents: 1256
diff changeset
110 #ifdef DEBUG_SEEK
1443
404048ea11bc Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents: 1441
diff changeset
111 av_log(s, AV_LOG_ERROR, "longs_pre_entry:%d index_type:%d entries_in_use:%d chunk_id:%X base:%16"PRIX64"\n",
1277
e27e94ac0c4b support some totally broken ODML variant
michael
parents: 1256
diff changeset
112 longs_pre_entry,index_type, entries_in_use, chunk_id, base);
e27e94ac0c4b support some totally broken ODML variant
michael
parents: 1256
diff changeset
113 #endif
977
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
114
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
115 if(stream_id > s->nb_streams || stream_id < 0)
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
116 return -1;
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
117 st= s->streams[stream_id];
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
118 ast = st->priv_data;
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
119
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
120 if(index_sub_type)
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
121 return -1;
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
122
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
123 get_le32(pb);
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
124
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
125 if(index_type && longs_pre_entry != 2)
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
126 return -1;
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
127 if(index_type>1)
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
128 return -1;
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
129
1277
e27e94ac0c4b support some totally broken ODML variant
michael
parents: 1256
diff changeset
130 if(filesize > 0 && base >= filesize){
e27e94ac0c4b support some totally broken ODML variant
michael
parents: 1256
diff changeset
131 av_log(s, AV_LOG_ERROR, "ODML index invalid\n");
e27e94ac0c4b support some totally broken ODML variant
michael
parents: 1256
diff changeset
132 if(base>>32 == (base & 0xFFFFFFFF) && (base & 0xFFFFFFFF) < filesize && filesize <= 0xFFFFFFFF)
e27e94ac0c4b support some totally broken ODML variant
michael
parents: 1256
diff changeset
133 base &= 0xFFFFFFFF;
e27e94ac0c4b support some totally broken ODML variant
michael
parents: 1256
diff changeset
134 else
e27e94ac0c4b support some totally broken ODML variant
michael
parents: 1256
diff changeset
135 return -1;
e27e94ac0c4b support some totally broken ODML variant
michael
parents: 1256
diff changeset
136 }
e27e94ac0c4b support some totally broken ODML variant
michael
parents: 1256
diff changeset
137
977
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
138 for(i=0; i<entries_in_use; i++){
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
139 if(index_type){
979
d2e5dfdf4def add size to AVIndex
michael
parents: 977
diff changeset
140 int64_t pos= get_le32(pb) + base - 8;
977
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
141 int len = get_le32(pb);
979
d2e5dfdf4def add size to AVIndex
michael
parents: 977
diff changeset
142 int key= len >= 0;
d2e5dfdf4def add size to AVIndex
michael
parents: 977
diff changeset
143 len &= 0x7FFFFFFF;
977
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
144
1277
e27e94ac0c4b support some totally broken ODML variant
michael
parents: 1256
diff changeset
145 #ifdef DEBUG_SEEK
1443
404048ea11bc Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents: 1441
diff changeset
146 av_log(s, AV_LOG_ERROR, "pos:%"PRId64", len:%X\n", pos, len);
1277
e27e94ac0c4b support some totally broken ODML variant
michael
parents: 1256
diff changeset
147 #endif
984
b644fe79f7a2 fixing av sync in videotest.avi (index doesnt match chunks, header doesnt indicate that)
michael
parents: 983
diff changeset
148 if(last_pos == pos || pos == base - 8)
b644fe79f7a2 fixing av sync in videotest.avi (index doesnt match chunks, header doesnt indicate that)
michael
parents: 983
diff changeset
149 avi->non_interleaved= 1;
b644fe79f7a2 fixing av sync in videotest.avi (index doesnt match chunks, header doesnt indicate that)
michael
parents: 983
diff changeset
150 else
1522
68620a6be643 fix support for avis with sample_size > packet size
michael
parents: 1489
diff changeset
151 av_add_index_entry(st, pos, ast->cum_len / FFMAX(1, ast->sample_size), len, 0, key ? AVINDEX_KEYFRAME : 0);
977
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
152
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
153 if(ast->sample_size)
1522
68620a6be643 fix support for avis with sample_size > packet size
michael
parents: 1489
diff changeset
154 ast->cum_len += len;
977
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
155 else
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
156 ast->cum_len ++;
984
b644fe79f7a2 fixing av sync in videotest.avi (index doesnt match chunks, header doesnt indicate that)
michael
parents: 983
diff changeset
157 last_pos= pos;
977
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
158 }else{
1144
d3a8c634106f kill warnings
mru
parents: 1120
diff changeset
159 int64_t offset, pos;
d3a8c634106f kill warnings
mru
parents: 1120
diff changeset
160 int duration;
d3a8c634106f kill warnings
mru
parents: 1120
diff changeset
161 offset = get_le64(pb);
d3a8c634106f kill warnings
mru
parents: 1120
diff changeset
162 get_le32(pb); /* size */
d3a8c634106f kill warnings
mru
parents: 1120
diff changeset
163 duration = get_le32(pb);
d3a8c634106f kill warnings
mru
parents: 1120
diff changeset
164 pos = url_ftell(pb);
977
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
165
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
166 url_fseek(pb, offset+8, SEEK_SET);
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
167 read_braindead_odml_indx(s, frame_num);
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
168 frame_num += duration;
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
169
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
170 url_fseek(pb, pos, SEEK_SET);
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
171 }
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
172 }
1277
e27e94ac0c4b support some totally broken ODML variant
michael
parents: 1256
diff changeset
173 avi->index_loaded=1;
977
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
174 return 0;
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
175 }
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
176
983
558381bf97d2 support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents: 982
diff changeset
177 static void clean_index(AVFormatContext *s){
1277
e27e94ac0c4b support some totally broken ODML variant
michael
parents: 1256
diff changeset
178 int i;
e27e94ac0c4b support some totally broken ODML variant
michael
parents: 1256
diff changeset
179 int64_t j;
983
558381bf97d2 support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents: 982
diff changeset
180
558381bf97d2 support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents: 982
diff changeset
181 for(i=0; i<s->nb_streams; i++){
558381bf97d2 support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents: 982
diff changeset
182 AVStream *st = s->streams[i];
558381bf97d2 support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents: 982
diff changeset
183 AVIStream *ast = st->priv_data;
558381bf97d2 support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents: 982
diff changeset
184 int n= st->nb_index_entries;
558381bf97d2 support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents: 982
diff changeset
185 int max= ast->sample_size;
558381bf97d2 support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents: 982
diff changeset
186 int64_t pos, size, ts;
558381bf97d2 support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents: 982
diff changeset
187
558381bf97d2 support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents: 982
diff changeset
188 if(n != 1 || ast->sample_size==0)
558381bf97d2 support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents: 982
diff changeset
189 continue;
558381bf97d2 support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents: 982
diff changeset
190
558381bf97d2 support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents: 982
diff changeset
191 while(max < 1024) max+=max;
558381bf97d2 support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents: 982
diff changeset
192
558381bf97d2 support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents: 982
diff changeset
193 pos= st->index_entries[0].pos;
558381bf97d2 support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents: 982
diff changeset
194 size= st->index_entries[0].size;
558381bf97d2 support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents: 982
diff changeset
195 ts= st->index_entries[0].timestamp;
558381bf97d2 support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents: 982
diff changeset
196
558381bf97d2 support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents: 982
diff changeset
197 for(j=0; j<size; j+=max){
558381bf97d2 support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents: 982
diff changeset
198 av_add_index_entry(st, pos+j, ts + j/ast->sample_size, FFMIN(max, size-j), 0, AVINDEX_KEYFRAME);
558381bf97d2 support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents: 982
diff changeset
199 }
558381bf97d2 support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents: 982
diff changeset
200 }
558381bf97d2 support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents: 982
diff changeset
201 }
558381bf97d2 support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents: 982
diff changeset
202
1256
2cddf00f92a6 AVI tag reading and writing patch by David Conrad.
banan
parents: 1172
diff changeset
203 static int avi_read_tag(ByteIOContext *pb, char *buf, int maxlen, unsigned int size)
2cddf00f92a6 AVI tag reading and writing patch by David Conrad.
banan
parents: 1172
diff changeset
204 {
2cddf00f92a6 AVI tag reading and writing patch by David Conrad.
banan
parents: 1172
diff changeset
205 offset_t i = url_ftell(pb);
2cddf00f92a6 AVI tag reading and writing patch by David Conrad.
banan
parents: 1172
diff changeset
206 size += (size & 1);
2cddf00f92a6 AVI tag reading and writing patch by David Conrad.
banan
parents: 1172
diff changeset
207 get_strz(pb, buf, maxlen);
2cddf00f92a6 AVI tag reading and writing patch by David Conrad.
banan
parents: 1172
diff changeset
208 url_fseek(pb, i+size, SEEK_SET);
2cddf00f92a6 AVI tag reading and writing patch by David Conrad.
banan
parents: 1172
diff changeset
209 return 0;
2cddf00f92a6 AVI tag reading and writing patch by David Conrad.
banan
parents: 1172
diff changeset
210 }
2cddf00f92a6 AVI tag reading and writing patch by David Conrad.
banan
parents: 1172
diff changeset
211
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
212 static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
213 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
214 AVIContext *avi = s->priv_data;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
215 ByteIOContext *pb = &s->pb;
98
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
216 uint32_t tag, tag1, handler;
703
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
217 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
218 unsigned int size, nb_frames;
1785
2376ab11ea73 support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents: 1761
diff changeset
219 int i;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
220 AVStream *st;
1144
d3a8c634106f kill warnings
mru
parents: 1120
diff changeset
221 AVIStream *ast = NULL;
1298
29fba975df47 Allow to get the the track number in the IPRT (part) tag in AVI.
gpoirier
parents: 1296
diff changeset
222 char str_track[4];
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
223
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
224 avi->stream_index= -1;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
225
92
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
226 if (get_riff(avi, pb) < 0)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
227 return -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
228
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
229 /* first list tag */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
230 stream_index = -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
231 codec_type = -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
232 frame_period = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
233 for(;;) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
234 if (url_feof(pb))
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
235 goto fail;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
236 tag = get_le32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
237 size = get_le32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
238 #ifdef DEBUG
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
239 print_tag("tag", tag, size);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
240 #endif
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
241
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
242 switch(tag) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
243 case MKTAG('L', 'I', 'S', 'T'):
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
244 /* ignored, except when start of video packets */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
245 tag1 = get_le32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
246 #ifdef DEBUG
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
247 print_tag("list", tag1, 0);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
248 #endif
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
249 if (tag1 == MKTAG('m', 'o', 'v', 'i')) {
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
250 avi->movi_list = url_ftell(pb) - 4;
1286
8b423c6ae233 Fix for AVI files with odd sized 'movi' list
gpoirier
parents: 1277
diff changeset
251 if(size) avi->movi_end = avi->movi_list + size + (size & 1);
764
cdb845a57ae4 drop most url_fileno() calls (allows to use ByteIOContext directly in caller apps instead of URLProtocol)
aurel
parents: 743
diff changeset
252 else avi->movi_end = url_fsize(pb);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
253 #ifdef DEBUG
1443
404048ea11bc Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents: 1441
diff changeset
254 printf("movi end=%"PRIx64"\n", avi->movi_end);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
255 #endif
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
256 goto end_of_header;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
257 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
258 break;
510
133287132e1d * simplifying OpenDML AVI handling.
romansh
parents: 495
diff changeset
259 case MKTAG('d', 'm', 'l', 'h'):
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
260 avi->is_odml = 1;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
261 url_fskip(pb, size + (size & 1));
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
262 break;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
263 case MKTAG('a', 'v', 'i', 'h'):
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
264 /* avi header */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
265 /* using frame_period is bad idea */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
266 frame_period = get_le32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
267 bit_rate = get_le32(pb) * 8;
981
55519fa957c3 fix demuxing of XviD_with_3_AAC-HE_audio_streams.avi
michael
parents: 980
diff changeset
268 get_le32(pb);
55519fa957c3 fix demuxing of XviD_with_3_AAC-HE_audio_streams.avi
michael
parents: 980
diff changeset
269 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
270
55519fa957c3 fix demuxing of XviD_with_3_AAC-HE_audio_streams.avi
michael
parents: 980
diff changeset
271 url_fskip(pb, 2 * 4);
1785
2376ab11ea73 support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents: 1761
diff changeset
272 get_le32(pb);
2376ab11ea73 support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents: 1761
diff changeset
273
2376ab11ea73 support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents: 1761
diff changeset
274 url_fskip(pb, size - 7 * 4);
2376ab11ea73 support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents: 1761
diff changeset
275 break;
2376ab11ea73 support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents: 1761
diff changeset
276 case MKTAG('s', 't', 'r', 'h'):
2376ab11ea73 support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents: 1761
diff changeset
277 /* stream header */
2376ab11ea73 support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents: 1761
diff changeset
278
2376ab11ea73 support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents: 1761
diff changeset
279 tag1 = get_le32(pb);
2376ab11ea73 support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents: 1761
diff changeset
280 handler = get_le32(pb); /* codec tag */
2376ab11ea73 support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents: 1761
diff changeset
281
2376ab11ea73 support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents: 1761
diff changeset
282 if(tag1 == MKTAG('p', 'a', 'd', 's')){
2376ab11ea73 support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents: 1761
diff changeset
283 url_fskip(pb, size - 8);
2376ab11ea73 support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents: 1761
diff changeset
284 break;
2376ab11ea73 support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents: 1761
diff changeset
285 }else{
2376ab11ea73 support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents: 1761
diff changeset
286 stream_index++;
2376ab11ea73 support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents: 1761
diff changeset
287 st = av_new_stream(s, stream_index);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
288 if (!st)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
289 goto fail;
462
b69898ffc92a move time_base (pts_num/pts_den) from AVFormatContext -> AVStream
michael
parents: 457
diff changeset
290
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
291 ast = av_mallocz(sizeof(AVIStream));
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
292 if (!ast)
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
293 goto fail;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
294 st->priv_data = ast;
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
295 }
1785
2376ab11ea73 support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents: 1761
diff changeset
296
471
8b7a8dccde70 skip subtitle streams instead of perishing
michael
parents: 469
diff changeset
297 #ifdef DEBUG
1441
ad3b03b7b142 reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents: 1415
diff changeset
298 print_tag("strh", tag1, -1);
471
8b7a8dccde70 skip subtitle streams instead of perishing
michael
parents: 469
diff changeset
299 #endif
703
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
300 if(tag1 == MKTAG('i', 'a', 'v', 's') || tag1 == MKTAG('i', 'v', 'a', 's')){
1629
aedce96c28ff * Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents: 1527
diff changeset
301 int64_t dv_dur;
aedce96c28ff * Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents: 1527
diff changeset
302
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
303 /*
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
304 * After some consideration -- I don't think we
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
305 * have to support anything but DV in a type1 AVIs.
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
306 */
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
307 if (s->nb_streams != 1)
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
308 goto fail;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
309
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
310 if (handler != MKTAG('d', 'v', 's', 'd') &&
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
311 handler != MKTAG('d', 'v', 'h', 'd') &&
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
312 handler != MKTAG('d', 'v', 's', 'l'))
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
313 goto fail;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
314
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
315 ast = s->streams[0]->priv_data;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
316 av_freep(&s->streams[0]->codec->extradata);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
317 av_freep(&s->streams[0]);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
318 s->nb_streams = 0;
1488
41a7ed2b064a Fix avidec.c compilation when dv demuxer is disabled.
aurel
parents: 1472
diff changeset
319 if (ENABLE_DV_DEMUXER) {
1489
40290ec3d034 cosmetic: fix indentation after previous commit
aurel
parents: 1488
diff changeset
320 avi->dv_demux = dv_init_demux(s);
40290ec3d034 cosmetic: fix indentation after previous commit
aurel
parents: 1488
diff changeset
321 if (!avi->dv_demux)
40290ec3d034 cosmetic: fix indentation after previous commit
aurel
parents: 1488
diff changeset
322 goto fail;
1488
41a7ed2b064a Fix avidec.c compilation when dv demuxer is disabled.
aurel
parents: 1472
diff changeset
323 }
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
324 s->streams[0]->priv_data = ast;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
325 url_fskip(pb, 3 * 4);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
326 ast->scale = get_le32(pb);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
327 ast->rate = get_le32(pb);
1629
aedce96c28ff * Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents: 1527
diff changeset
328 url_fskip(pb, 4); /* start time */
aedce96c28ff * Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents: 1527
diff changeset
329
aedce96c28ff * Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents: 1527
diff changeset
330 dv_dur = get_le32(pb);
aedce96c28ff * Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents: 1527
diff changeset
331 if (ast->scale > 0 && ast->rate > 0 && dv_dur > 0) {
aedce96c28ff * Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents: 1527
diff changeset
332 dv_dur *= AV_TIME_BASE;
aedce96c28ff * Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents: 1527
diff changeset
333 s->duration = av_rescale(dv_dur, ast->scale, ast->rate);
aedce96c28ff * Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents: 1527
diff changeset
334 }
aedce96c28ff * Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents: 1527
diff changeset
335 /*
aedce96c28ff * Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents: 1527
diff changeset
336 * else, leave duration alone; timing estimation in utils.c
aedce96c28ff * Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents: 1527
diff changeset
337 * will make a guess based on bit rate.
aedce96c28ff * Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents: 1527
diff changeset
338 */
aedce96c28ff * Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents: 1527
diff changeset
339
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
340 stream_index = s->nb_streams - 1;
1629
aedce96c28ff * Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents: 1527
diff changeset
341 url_fskip(pb, size - 9*4);
703
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
342 break;
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
343 }
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
344
1785
2376ab11ea73 support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents: 1761
diff changeset
345 assert(stream_index < s->nb_streams);
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
346 st->codec->stream_codec_tag= handler;
703
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
347
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
348 get_le32(pb); /* flags */
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
349 get_le16(pb); /* priority */
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
350 get_le16(pb); /* language */
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
351 get_le32(pb); /* initial frame */
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
352 ast->scale = get_le32(pb);
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
353 ast->rate = get_le32(pb);
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
354 if(ast->scale && ast->rate){
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
355 }else if(frame_period){
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
356 ast->rate = 1000000;
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
357 ast->scale = frame_period;
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
358 }else{
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
359 ast->rate = 25;
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
360 ast->scale = 1;
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
361 }
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
362 av_set_pts_info(st, 64, ast->scale, ast->rate);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
363
989
e4eb95d550ca dwstart support
michael
parents: 988
diff changeset
364 ast->cum_len=get_le32(pb); /* start */
703
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
365 nb_frames = get_le32(pb);
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
366
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
367 st->start_time = 0;
743
af4e24d6310c switch to native time bases
michael
parents: 718
diff changeset
368 st->duration = nb_frames;
703
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
369 get_le32(pb); /* buffer size */
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
370 get_le32(pb); /* quality */
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
371 ast->sample_size = get_le32(pb); /* sample ssize */
1522
68620a6be643 fix support for avis with sample_size > packet size
michael
parents: 1489
diff changeset
372 ast->cum_len *= FFMAX(1, ast->sample_size);
703
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
373 // 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
374
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
375 switch(tag1) {
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
376 case MKTAG('v', 'i', 'd', 's'):
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
377 codec_type = CODEC_TYPE_VIDEO;
75
78bec272ce3a read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents: 73
diff changeset
378
703
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
379 ast->sample_size = 0;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
380 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
381 case MKTAG('a', 'u', 'd', 's'):
703
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
382 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
383 break;
471
8b7a8dccde70 skip subtitle streams instead of perishing
michael
parents: 469
diff changeset
384 case MKTAG('t', 'x', 't', 's'):
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
385 //FIXME
471
8b7a8dccde70 skip subtitle streams instead of perishing
michael
parents: 469
diff changeset
386 codec_type = CODEC_TYPE_DATA; //CODEC_TYPE_SUB ? FIXME
8b7a8dccde70 skip subtitle streams instead of perishing
michael
parents: 469
diff changeset
387 break;
73
d40ddc73858a reversing not yet reversed changes from r1.7 -> r1.8 except the static/const stuff
michaelni
parents: 65
diff changeset
388 default:
534
3846c006af2b pads stream
michael
parents: 526
diff changeset
389 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
390 goto fail;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
391 }
1522
68620a6be643 fix support for avis with sample_size > packet size
michael
parents: 1489
diff changeset
392 ast->frame_offset= ast->cum_len;
703
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
393 url_fskip(pb, size - 12 * 4);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
394 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
395 case MKTAG('s', 't', 'r', 'f'):
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
396 /* stream header */
1785
2376ab11ea73 support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents: 1761
diff changeset
397 if (stream_index >= (unsigned)s->nb_streams || avi->dv_demux) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
398 url_fskip(pb, size);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
399 } else {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
400 st = s->streams[stream_index];
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
401 switch(codec_type) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
402 case CODEC_TYPE_VIDEO:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
403 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
404 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
405 st->codec->height = get_le32(pb);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
406 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
407 st->codec->bits_per_sample= get_le16(pb); /* depth */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
408 tag1 = get_le32(pb);
75
78bec272ce3a read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents: 73
diff changeset
409 get_le32(pb); /* ImageSize */
78bec272ce3a read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents: 73
diff changeset
410 get_le32(pb); /* XPelsPerMeter */
78bec272ce3a read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents: 73
diff changeset
411 get_le32(pb); /* YPelsPerMeter */
78bec272ce3a read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents: 73
diff changeset
412 get_le32(pb); /* ClrUsed */
78bec272ce3a read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents: 73
diff changeset
413 get_le32(pb); /* ClrImportant */
78bec272ce3a read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents: 73
diff changeset
414
1441
ad3b03b7b142 reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents: 1415
diff changeset
415 if(size > 10*4 && size<(1<<30)){
ad3b03b7b142 reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents: 1415
diff changeset
416 st->codec->extradata_size= size - 10*4;
ad3b03b7b142 reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents: 1415
diff changeset
417 st->codec->extradata= av_malloc(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
ad3b03b7b142 reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents: 1415
diff changeset
418 get_buffer(pb, st->codec->extradata, st->codec->extradata_size);
ad3b03b7b142 reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents: 1415
diff changeset
419 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
420
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
421 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
422 get_byte(pb);
75
78bec272ce3a read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents: 73
diff changeset
423
297
85d558a18134 Make avi and asf demuxer export palette in palctrl
rtognimp
parents: 296
diff changeset
424 /* Extract palette from extradata if bpp <= 8 */
85d558a18134 Make avi and asf demuxer export palette in palctrl
rtognimp
parents: 296
diff changeset
425 /* This code assumes that extradata contains only palette */
85d558a18134 Make avi and asf demuxer export palette in palctrl
rtognimp
parents: 296
diff changeset
426 /* 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
427 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
428 st->codec->palctrl = av_mallocz(sizeof(AVPaletteControl));
297
85d558a18134 Make avi and asf demuxer export palette in palctrl
rtognimp
parents: 296
diff changeset
429 #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
430 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
431 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
432 #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
433 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
434 FFMIN(st->codec->extradata_size, AVPALETTE_SIZE));
297
85d558a18134 Make avi and asf demuxer export palette in palctrl
rtognimp
parents: 296
diff changeset
435 #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
436 st->codec->palctrl->palette_changed = 1;
297
85d558a18134 Make avi and asf demuxer export palette in palctrl
rtognimp
parents: 296
diff changeset
437 }
85d558a18134 Make avi and asf demuxer export palette in palctrl
rtognimp
parents: 296
diff changeset
438
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
439 #ifdef DEBUG
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
440 print_tag("video", tag1, 0);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
441 #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
442 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
443 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
444 st->codec->codec_id = codec_get_id(codec_bmp_tags, tag1);
842
43210d766412 parse pict_type for streams in avi
michael
parents: 838
diff changeset
445 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
446 // url_fskip(pb, size - 5 * 4);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
447 break;
73
d40ddc73858a reversing not yet reversed changes from r1.7 -> r1.8 except the static/const stuff
michaelni
parents: 65
diff changeset
448 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
449 get_wav_header(pb, st->codec, size);
988
fb8b2bb9f716 fixing demuxing of minorityreport.AVI
michael
parents: 984
diff changeset
450 if(ast->sample_size && st->codec->block_align && ast->sample_size % st->codec->block_align)
fb8b2bb9f716 fixing demuxing of minorityreport.AVI
michael
parents: 984
diff changeset
451 av_log(s, AV_LOG_DEBUG, "invalid sample size or block align detected\n");
13
8a5285a0ca2f Fix for odd strf tag in Stargate SG-1 - 3x18 - Shades of Grey.avi
mmu_man
parents: 5
diff changeset
452 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
453 url_fskip(pb, 1);
1527
185cafb49ae8 Fix misplaced comment.
diego
parents: 1526
diff changeset
454 /* Force parsing as several audio frames can be in
185cafb49ae8 Fix misplaced comment.
diego
parents: 1526
diff changeset
455 * one packet. */
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
456 st->need_parsing = 1;
1472
49d5a5ca2987 get rid of CODEC_ID_MPEG4AAC after next version bump, and change it to CODEC_ID_AAC where used
bcoudurier
parents: 1443
diff changeset
457 /* ADTS header is in extradata, AAC without header must be stored as exact frames, parser not needed and it will fail */
49d5a5ca2987 get rid of CODEC_ID_MPEG4AAC after next version bump, and change it to CODEC_ID_AAC where used
bcoudurier
parents: 1443
diff changeset
458 if (st->codec->codec_id == CODEC_ID_AAC && st->codec->extradata_size)
49d5a5ca2987 get rid of CODEC_ID_MPEG4AAC after next version bump, and change it to CODEC_ID_AAC where used
bcoudurier
parents: 1443
diff changeset
459 st->need_parsing = 0;
1526
135565ec768d Clean up XAN DPCM hack and set codec_tag to 0 for XAN DPCM, AVI files
diego
parents: 1522
diff changeset
460 /* AVI files with Xan DPCM audio (wrongly) declare PCM
135565ec768d Clean up XAN DPCM hack and set codec_tag to 0 for XAN DPCM, AVI files
diego
parents: 1522
diff changeset
461 * audio in the header but have Axan as stream_code_tag. */
135565ec768d Clean up XAN DPCM hack and set codec_tag to 0 for XAN DPCM, AVI files
diego
parents: 1522
diff changeset
462 if (st->codec->stream_codec_tag == ff_get_fourcc("Axan")){
135565ec768d Clean up XAN DPCM hack and set codec_tag to 0 for XAN DPCM, AVI files
diego
parents: 1522
diff changeset
463 st->codec->codec_id = CODEC_ID_XAN_DPCM;
135565ec768d Clean up XAN DPCM hack and set codec_tag to 0 for XAN DPCM, AVI files
diego
parents: 1522
diff changeset
464 st->codec->codec_tag = 0;
135565ec768d Clean up XAN DPCM hack and set codec_tag to 0 for XAN DPCM, AVI files
diego
parents: 1522
diff changeset
465 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
466 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
467 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
468 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
469 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
470 st->codec->codec_tag= 0;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
471 url_fskip(pb, size);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
472 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
473 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
474 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
475 break;
977
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
476 case MKTAG('i', 'n', 'd', 'x'):
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
477 i= url_ftell(pb);
1294
12398b868e18 ignore index parameter to ignore the ODML index in avi
michael
parents: 1286
diff changeset
478 if(!url_is_streamed(pb) && !(s->flags & AVFMT_FLAG_IGNIDX)){
1115
8aa77d05572e dont load the index if we cant seek back
michael
parents: 1051
diff changeset
479 read_braindead_odml_indx(s, 0);
8aa77d05572e dont load the index if we cant seek back
michael
parents: 1051
diff changeset
480 }
977
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
481 url_fseek(pb, i+size, SEEK_SET);
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
482 break;
1256
2cddf00f92a6 AVI tag reading and writing patch by David Conrad.
banan
parents: 1172
diff changeset
483 case MKTAG('I', 'N', 'A', 'M'):
2cddf00f92a6 AVI tag reading and writing patch by David Conrad.
banan
parents: 1172
diff changeset
484 avi_read_tag(pb, s->title, sizeof(s->title), size);
2cddf00f92a6 AVI tag reading and writing patch by David Conrad.
banan
parents: 1172
diff changeset
485 break;
2cddf00f92a6 AVI tag reading and writing patch by David Conrad.
banan
parents: 1172
diff changeset
486 case MKTAG('I', 'A', 'R', 'T'):
2cddf00f92a6 AVI tag reading and writing patch by David Conrad.
banan
parents: 1172
diff changeset
487 avi_read_tag(pb, s->author, sizeof(s->author), size);
2cddf00f92a6 AVI tag reading and writing patch by David Conrad.
banan
parents: 1172
diff changeset
488 break;
2cddf00f92a6 AVI tag reading and writing patch by David Conrad.
banan
parents: 1172
diff changeset
489 case MKTAG('I', 'C', 'O', 'P'):
2cddf00f92a6 AVI tag reading and writing patch by David Conrad.
banan
parents: 1172
diff changeset
490 avi_read_tag(pb, s->copyright, sizeof(s->copyright), size);
2cddf00f92a6 AVI tag reading and writing patch by David Conrad.
banan
parents: 1172
diff changeset
491 break;
2cddf00f92a6 AVI tag reading and writing patch by David Conrad.
banan
parents: 1172
diff changeset
492 case MKTAG('I', 'C', 'M', 'T'):
2cddf00f92a6 AVI tag reading and writing patch by David Conrad.
banan
parents: 1172
diff changeset
493 avi_read_tag(pb, s->comment, sizeof(s->comment), size);
2cddf00f92a6 AVI tag reading and writing patch by David Conrad.
banan
parents: 1172
diff changeset
494 break;
2cddf00f92a6 AVI tag reading and writing patch by David Conrad.
banan
parents: 1172
diff changeset
495 case MKTAG('I', 'G', 'N', 'R'):
2cddf00f92a6 AVI tag reading and writing patch by David Conrad.
banan
parents: 1172
diff changeset
496 avi_read_tag(pb, s->genre, sizeof(s->genre), size);
2cddf00f92a6 AVI tag reading and writing patch by David Conrad.
banan
parents: 1172
diff changeset
497 break;
1296
654749c12a29 Better tag support:
gpoirier
parents: 1294
diff changeset
498 case MKTAG('I', 'P', 'R', 'D'):
654749c12a29 Better tag support:
gpoirier
parents: 1294
diff changeset
499 avi_read_tag(pb, s->album, sizeof(s->album), size);
654749c12a29 Better tag support:
gpoirier
parents: 1294
diff changeset
500 break;
1298
29fba975df47 Allow to get the the track number in the IPRT (part) tag in AVI.
gpoirier
parents: 1296
diff changeset
501 case MKTAG('I', 'P', 'R', 'T'):
29fba975df47 Allow to get the the track number in the IPRT (part) tag in AVI.
gpoirier
parents: 1296
diff changeset
502 avi_read_tag(pb, str_track, sizeof(str_track), size);
29fba975df47 Allow to get the the track number in the IPRT (part) tag in AVI.
gpoirier
parents: 1296
diff changeset
503 sscanf(str_track, "%d", &s->track);
29fba975df47 Allow to get the the track number in the IPRT (part) tag in AVI.
gpoirier
parents: 1296
diff changeset
504 break;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
505 default:
1894
1cbd1d658165 fix demuxing of broken MVI_3011.avi
michael
parents: 1785
diff changeset
506 if(size > 1000000){
1cbd1d658165 fix demuxing of broken MVI_3011.avi
michael
parents: 1785
diff changeset
507 av_log(s, AV_LOG_ERROR, "well something went wrong during header parsing, "
1cbd1d658165 fix demuxing of broken MVI_3011.avi
michael
parents: 1785
diff changeset
508 "ill ignore it and try to continue anyway\n");
1cbd1d658165 fix demuxing of broken MVI_3011.avi
michael
parents: 1785
diff changeset
509 avi->movi_list = url_ftell(pb) - 4;
1cbd1d658165 fix demuxing of broken MVI_3011.avi
michael
parents: 1785
diff changeset
510 avi->movi_end = url_fsize(pb);
1cbd1d658165 fix demuxing of broken MVI_3011.avi
michael
parents: 1785
diff changeset
511 goto end_of_header;
1cbd1d658165 fix demuxing of broken MVI_3011.avi
michael
parents: 1785
diff changeset
512 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
513 /* skip tag */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
514 size += (size & 1);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
515 url_fskip(pb, size);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
516 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
517 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
518 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
519 end_of_header:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
520 /* check stream number */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
521 if (stream_index != s->nb_streams - 1) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
522 fail:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
523 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
524 av_freep(&s->streams[i]->codec->extradata);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
525 av_freep(&s->streams[i]);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
526 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
527 return -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
528 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
529
1115
8aa77d05572e dont load the index if we cant seek back
michael
parents: 1051
diff changeset
530 if(!avi->index_loaded && !url_is_streamed(pb))
977
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
531 avi_load_index(s);
469
6a4cc19e8d9b exporting keyframe flags, fixes keyframe stuff with streamcopy
michael
parents: 466
diff changeset
532 avi->index_loaded = 1;
979
d2e5dfdf4def add size to AVIndex
michael
parents: 977
diff changeset
533 avi->non_interleaved |= guess_ni_flag(s);
983
558381bf97d2 support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents: 982
diff changeset
534 if(avi->non_interleaved)
558381bf97d2 support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents: 982
diff changeset
535 clean_index(s);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
536
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
537 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
538 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
539
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
540 static int avi_read_packet(AVFormatContext *s, AVPacket *pkt)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
541 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
542 AVIContext *avi = s->priv_data;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
543 ByteIOContext *pb = &s->pb;
510
133287132e1d * simplifying OpenDML AVI handling.
romansh
parents: 495
diff changeset
544 int n, d[8], size;
569
aca10aa7686f fixing demuxing of vc2_intro.avi
michael
parents: 562
diff changeset
545 offset_t i, sync;
262
f174d9c00bce * DV handling was streamlined for both muxing/demuxing and
romansh
parents: 227
diff changeset
546 void* dstr;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
547
1488
41a7ed2b064a Fix avidec.c compilation when dv demuxer is disabled.
aurel
parents: 1472
diff changeset
548 if (ENABLE_DV_DEMUXER && avi->dv_demux) {
262
f174d9c00bce * DV handling was streamlined for both muxing/demuxing and
romansh
parents: 227
diff changeset
549 size = dv_get_packet(avi->dv_demux, pkt);
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
550 if (size >= 0)
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
551 return size;
149
f4de8f9c39bd use custom packet allocation only for DV
bellard
parents: 119
diff changeset
552 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
553
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
554 if(avi->non_interleaved){
851
62e66722e9bb Kill some compiler warnings. Compiled code verified identical after changes.
mru
parents: 842
diff changeset
555 int best_stream_index = 0;
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
556 AVStream *best_st= NULL;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
557 AVIStream *best_ast;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
558 int64_t best_ts= INT64_MAX;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
559 int i;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
560
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
561 for(i=0; i<s->nb_streams; i++){
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
562 AVStream *st = s->streams[i];
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
563 AVIStream *ast = st->priv_data;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
564 int64_t ts= ast->frame_offset;
569
aca10aa7686f fixing demuxing of vc2_intro.avi
michael
parents: 562
diff changeset
565
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
566 if(ast->sample_size)
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
567 ts /= ast->sample_size;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
568 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
569
1443
404048ea11bc Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents: 1441
diff changeset
570 // av_log(NULL, AV_LOG_DEBUG, "%"PRId64" %d/%d %"PRId64"\n", ts, st->time_base.num, st->time_base.den, ast->frame_offset);
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
571 if(ts < best_ts){
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
572 best_ts= ts;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
573 best_st= st;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
574 best_stream_index= i;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
575 }
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
576 }
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
577 best_ast = best_st->priv_data;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
578 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
579 if(best_ast->remaining)
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
580 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
581 else
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
582 i= av_index_search_timestamp(best_st, best_ts, AVSEEK_FLAG_ANY);
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
583
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
584 // av_log(NULL, AV_LOG_DEBUG, "%d\n", i);
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
585 if(i>=0){
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
586 int64_t pos= best_st->index_entries[i].pos;
980
da4296d3bc39 add movi_list offset into index
michael
parents: 979
diff changeset
587 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
588 url_fseek(&s->pb, pos + 8, SEEK_SET);
1443
404048ea11bc Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents: 1441
diff changeset
589 // av_log(NULL, AV_LOG_DEBUG, "pos=%"PRId64"\n", pos);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
590
982
c21f07d85158 10l forgot to set packet_size
michael
parents: 981
diff changeset
591 assert(best_ast->remaining <= best_ast->packet_size);
c21f07d85158 10l forgot to set packet_size
michael
parents: 981
diff changeset
592
981
55519fa957c3 fix demuxing of XviD_with_3_AAC-HE_audio_streams.avi
michael
parents: 980
diff changeset
593 avi->stream_index= best_stream_index;
55519fa957c3 fix demuxing of XviD_with_3_AAC-HE_audio_streams.avi
michael
parents: 980
diff changeset
594 if(!best_ast->remaining)
982
c21f07d85158 10l forgot to set packet_size
michael
parents: 981
diff changeset
595 best_ast->packet_size=
981
55519fa957c3 fix demuxing of XviD_with_3_AAC-HE_audio_streams.avi
michael
parents: 980
diff changeset
596 best_ast->remaining= best_st->index_entries[i].size;
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
597 }
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
598 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
599
569
aca10aa7686f fixing demuxing of vc2_intro.avi
michael
parents: 562
diff changeset
600 resync:
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
601 if(avi->stream_index >= 0){
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
602 AVStream *st= s->streams[ avi->stream_index ];
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
603 AVIStream *ast= st->priv_data;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
604 int size;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
605
988
fb8b2bb9f716 fixing demuxing of minorityreport.AVI
michael
parents: 984
diff changeset
606 if(ast->sample_size <= 1) // minorityreport.AVI block_align=1024 sample_size=1 IMA-ADPCM
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
607 size= INT_MAX;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
608 else if(ast->sample_size < 32)
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
609 size= 64*ast->sample_size;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
610 else
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
611 size= ast->sample_size;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
612
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
613 if(size > ast->remaining)
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
614 size= ast->remaining;
775
c5077fdab490 AVPacket.pos
michael
parents: 764
diff changeset
615 av_get_packet(pb, pkt, size);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
616
1488
41a7ed2b064a Fix avidec.c compilation when dv demuxer is disabled.
aurel
parents: 1472
diff changeset
617 if (ENABLE_DV_DEMUXER && avi->dv_demux) {
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
618 dstr = pkt->destruct;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
619 size = dv_produce_packet(avi->dv_demux, pkt,
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
620 pkt->data, pkt->size);
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
621 pkt->destruct = dstr;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
622 pkt->flags |= PKT_FLAG_KEY;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
623 } else {
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
624 /* XXX: how to handle B frames in avi ? */
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
625 pkt->dts = ast->frame_offset;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
626 // pkt->dts += ast->start;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
627 if(ast->sample_size)
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
628 pkt->dts /= ast->sample_size;
1443
404048ea11bc Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents: 1441
diff changeset
629 //av_log(NULL, AV_LOG_DEBUG, "dts:%"PRId64" offset:%"PRId64" %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
630 pkt->stream_index = avi->stream_index;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
631
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
632 if (st->codec->codec_type == CODEC_TYPE_VIDEO) {
1758
michael
parents: 1757
diff changeset
633 AVIndexEntry *e;
michael
parents: 1757
diff changeset
634 int index;
1757
9d217a18aa49 dynamic index building so forward and backward seeking in avi without an index is possible
michael
parents: 1721
diff changeset
635 assert(st->index_entries);
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
636
1758
michael
parents: 1757
diff changeset
637 index= av_index_search_timestamp(st, pkt->dts, 0);
michael
parents: 1757
diff changeset
638 e= &st->index_entries[index];
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
639
1758
michael
parents: 1757
diff changeset
640 if(index >= 0 && e->timestamp == ast->frame_offset){
michael
parents: 1757
diff changeset
641 if (e->flags & AVINDEX_KEYFRAME)
michael
parents: 1757
diff changeset
642 pkt->flags |= PKT_FLAG_KEY;
michael
parents: 1757
diff changeset
643 }
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
644 } else {
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
645 pkt->flags |= PKT_FLAG_KEY;
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
646 }
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
647 if(ast->sample_size)
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
648 ast->frame_offset += pkt->size;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
649 else
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
650 ast->frame_offset++;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
651 }
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
652 ast->remaining -= size;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
653 if(!ast->remaining){
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
654 avi->stream_index= -1;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
655 ast->packet_size= 0;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
656 }
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
657
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
658 return size;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
659 }
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
660
569
aca10aa7686f fixing demuxing of vc2_intro.avi
michael
parents: 562
diff changeset
661 memset(d, -1, sizeof(int)*8);
aca10aa7686f fixing demuxing of vc2_intro.avi
michael
parents: 562
diff changeset
662 for(i=sync=url_ftell(pb); !url_feof(pb); i++) {
82
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
663 int j;
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
664
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
665 if (i >= avi->movi_end) {
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
666 if (avi->is_odml) {
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
667 url_fskip(pb, avi->riff_end - i);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
668 avi->riff_end = avi->movi_end = url_fsize(pb);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
669 } else
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
670 break;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
671 }
92
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
672
82
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
673 for(j=0; j<7; j++)
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
674 d[j]= d[j+1];
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
675 d[7]= get_byte(pb);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
676
82
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
677 size= d[4] + (d[5]<<8) + (d[6]<<16) + (d[7]<<24);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
678
519
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
679 if( d[2] >= '0' && d[2] <= '9'
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
680 && d[3] >= '0' && d[3] <= '9'){
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
681 n= (d[2] - '0') * 10 + (d[3] - '0');
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
682 }else{
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
683 n= 100; //invalid stream id
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
684 }
1443
404048ea11bc Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents: 1441
diff changeset
685 //av_log(NULL, AV_LOG_DEBUG, "%X %X %X %X %X %X %X %X %"PRId64" %d %d\n", d[0], d[1], d[2], d[3], d[4], d[5], d[6], d[7], i, size, n);
519
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
686 if(i + size > avi->movi_end || d[0]<0)
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
687 continue;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
688
82
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
689 //parse ix##
519
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
690 if( (d[0] == 'i' && d[1] == 'x' && n < s->nb_streams)
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
691 //parse JUNK
519
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
692 ||(d[0] == 'J' && d[1] == 'U' && d[2] == 'N' && d[3] == 'K')){
82
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
693 url_fskip(pb, size);
519
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
694 //av_log(NULL, AV_LOG_DEBUG, "SKIP\n");
569
aca10aa7686f fixing demuxing of vc2_intro.avi
michael
parents: 562
diff changeset
695 goto resync;
82
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
696 }
510
133287132e1d * simplifying OpenDML AVI handling.
romansh
parents: 495
diff changeset
697
519
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
698 if( d[0] >= '0' && d[0] <= '9'
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
699 && d[1] >= '0' && d[1] <= '9'){
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
700 n= (d[0] - '0') * 10 + (d[1] - '0');
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
701 }else{
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
702 n= 100; //invalid stream id
510
133287132e1d * simplifying OpenDML AVI handling.
romansh
parents: 495
diff changeset
703 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
704
82
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
705 //parse ##dc/##wb
705
594a9b0cacf5 reverse zero packet dissapearence "feature"
michael
parents: 703
diff changeset
706 if(n < s->nb_streams){
519
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
707 AVStream *st;
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
708 AVIStream *ast;
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
709 st = s->streams[n];
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
710 ast = st->priv_data;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
711
708
d79164865a7c more fine grained discarding of packets
michael
parents: 705
diff changeset
712 if( (st->discard >= AVDISCARD_DEFAULT && size==0)
d79164865a7c more fine grained discarding of packets
michael
parents: 705
diff changeset
713 /*|| (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
714 || st->discard >= AVDISCARD_ALL){
d79164865a7c more fine grained discarding of packets
michael
parents: 705
diff changeset
715 if(ast->sample_size) ast->frame_offset += pkt->size;
d79164865a7c more fine grained discarding of packets
michael
parents: 705
diff changeset
716 else ast->frame_offset++;
650
c129846f7f02 support discarding of uninterresting packets
michael
parents: 649
diff changeset
717 url_fskip(pb, size);
c129846f7f02 support discarding of uninterresting packets
michael
parents: 649
diff changeset
718 goto resync;
c129846f7f02 support discarding of uninterresting packets
michael
parents: 649
diff changeset
719 }
519
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
720
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
721 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
722 d[2]*256+d[3] == ast->prefix /*||
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
723 (d[2] == 'd' && d[3] == 'c') ||
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
724 (d[2] == 'w' && d[3] == 'b')*/) {
519
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
725
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
726 //av_log(NULL, AV_LOG_DEBUG, "OK\n");
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
727 if(d[2]*256+d[3] == ast->prefix)
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
728 ast->prefix_count++;
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
729 else{
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
730 ast->prefix= d[2]*256+d[3];
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
731 ast->prefix_count= 0;
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
732 }
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
733
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
734 avi->stream_index= n;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
735 ast->packet_size= size + 8;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
736 ast->remaining= size;
1757
9d217a18aa49 dynamic index building so forward and backward seeking in avi without an index is possible
michael
parents: 1721
diff changeset
737
9d217a18aa49 dynamic index building so forward and backward seeking in avi without an index is possible
michael
parents: 1721
diff changeset
738 {
9d217a18aa49 dynamic index building so forward and backward seeking in avi without an index is possible
michael
parents: 1721
diff changeset
739 uint64_t pos= url_ftell(pb) - 8;
9d217a18aa49 dynamic index building so forward and backward seeking in avi without an index is possible
michael
parents: 1721
diff changeset
740 if(!st->index_entries || !st->nb_index_entries || st->index_entries[st->nb_index_entries - 1].pos < pos){
9d217a18aa49 dynamic index building so forward and backward seeking in avi without an index is possible
michael
parents: 1721
diff changeset
741 av_add_index_entry(st, pos, ast->frame_offset / FFMAX(1, ast->sample_size), size, 0, AVINDEX_KEYFRAME);
9d217a18aa49 dynamic index building so forward and backward seeking in avi without an index is possible
michael
parents: 1721
diff changeset
742 }
9d217a18aa49 dynamic index building so forward and backward seeking in avi without an index is possible
michael
parents: 1721
diff changeset
743 }
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
744 goto resync;
519
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
745 }
82
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
746 }
520
5d96fe8f6560 added support for the elusive AVI palette change chunk, courtesy of
melanson
parents: 519
diff changeset
747 /* palette changed chunk */
5d96fe8f6560 added support for the elusive AVI palette change chunk, courtesy of
melanson
parents: 519
diff changeset
748 if ( d[0] >= '0' && d[0] <= '9'
5d96fe8f6560 added support for the elusive AVI palette change chunk, courtesy of
melanson
parents: 519
diff changeset
749 && d[1] >= '0' && d[1] <= '9'
5d96fe8f6560 added support for the elusive AVI palette change chunk, courtesy of
melanson
parents: 519
diff changeset
750 && ((d[2] == 'p' && d[3] == 'c'))
5d96fe8f6560 added support for the elusive AVI palette change chunk, courtesy of
melanson
parents: 519
diff changeset
751 && 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
752
5d96fe8f6560 added support for the elusive AVI palette change chunk, courtesy of
melanson
parents: 519
diff changeset
753 AVStream *st;
5d96fe8f6560 added support for the elusive AVI palette change chunk, courtesy of
melanson
parents: 519
diff changeset
754 int first, clr, flags, k, p;
5d96fe8f6560 added support for the elusive AVI palette change chunk, courtesy of
melanson
parents: 519
diff changeset
755
5d96fe8f6560 added support for the elusive AVI palette change chunk, courtesy of
melanson
parents: 519
diff changeset
756 st = s->streams[n];
5d96fe8f6560 added support for the elusive AVI palette change chunk, courtesy of
melanson
parents: 519
diff changeset
757
5d96fe8f6560 added support for the elusive AVI palette change chunk, courtesy of
melanson
parents: 519
diff changeset
758 first = get_byte(pb);
5d96fe8f6560 added support for the elusive AVI palette change chunk, courtesy of
melanson
parents: 519
diff changeset
759 clr = get_byte(pb);
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
760 if(!clr) /* all 256 colors used */
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
761 clr = 256;
520
5d96fe8f6560 added support for the elusive AVI palette change chunk, courtesy of
melanson
parents: 519
diff changeset
762 flags = get_le16(pb);
5d96fe8f6560 added support for the elusive AVI palette change chunk, courtesy of
melanson
parents: 519
diff changeset
763 p = 4;
5d96fe8f6560 added support for the elusive AVI palette change chunk, courtesy of
melanson
parents: 519
diff changeset
764 for (k = first; k < clr + first; k++) {
5d96fe8f6560 added support for the elusive AVI palette change chunk, courtesy of
melanson
parents: 519
diff changeset
765 int r, g, b;
5d96fe8f6560 added support for the elusive AVI palette change chunk, courtesy of
melanson
parents: 519
diff changeset
766 r = get_byte(pb);
5d96fe8f6560 added support for the elusive AVI palette change chunk, courtesy of
melanson
parents: 519
diff changeset
767 g = get_byte(pb);
5d96fe8f6560 added support for the elusive AVI palette change chunk, courtesy of
melanson
parents: 519
diff changeset
768 b = get_byte(pb);
5d96fe8f6560 added support for the elusive AVI palette change chunk, courtesy of
melanson
parents: 519
diff changeset
769 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
770 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
771 }
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
772 st->codec->palctrl->palette_changed = 1;
569
aca10aa7686f fixing demuxing of vc2_intro.avi
michael
parents: 562
diff changeset
773 goto resync;
520
5d96fe8f6560 added support for the elusive AVI palette change chunk, courtesy of
melanson
parents: 519
diff changeset
774 }
5d96fe8f6560 added support for the elusive AVI palette change chunk, courtesy of
melanson
parents: 519
diff changeset
775
82
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
776 }
519
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
777
82
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
778 return -1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
779 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
780
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
781 /* XXX: we make the implicit supposition that the position are sorted
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
782 for each stream */
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
783 static int avi_read_idx1(AVFormatContext *s, int size)
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
784 {
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
785 AVIContext *avi = s->priv_data;
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
786 ByteIOContext *pb = &s->pb;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
787 int nb_index_entries, i;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
788 AVStream *st;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
789 AVIStream *ast;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
790 unsigned int index, tag, flags, pos, len;
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
791 unsigned last_pos= -1;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
792
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
793 nb_index_entries = size / 16;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
794 if (nb_index_entries <= 0)
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
795 return -1;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
796
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
797 /* read the entries and sort them in each stream component */
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
798 for(i = 0; i < nb_index_entries; i++) {
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
799 tag = get_le32(pb);
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
800 flags = get_le32(pb);
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
801 pos = get_le32(pb);
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
802 len = get_le32(pb);
700
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
803 #if defined(DEBUG_SEEK)
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
804 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
805 i, tag, flags, pos, len);
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
806 #endif
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
807 if(i==0 && pos > avi->movi_list)
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
808 avi->movi_list= 0; //FIXME better check
980
da4296d3bc39 add movi_list offset into index
michael
parents: 979
diff changeset
809 pos += avi->movi_list;
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
810
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
811 index = ((tag & 0xff) - '0') * 10;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
812 index += ((tag >> 8) & 0xff) - '0';
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
813 if (index >= s->nb_streams)
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
814 continue;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
815 st = s->streams[index];
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
816 ast = st->priv_data;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
817
700
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
818 #if defined(DEBUG_SEEK)
1443
404048ea11bc Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents: 1441
diff changeset
819 av_log(NULL, AV_LOG_DEBUG, "%d cum_len=%"PRId64"\n", len, ast->cum_len);
700
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
820 #endif
705
594a9b0cacf5 reverse zero packet dissapearence "feature"
michael
parents: 703
diff changeset
821 if(last_pos == pos)
594a9b0cacf5 reverse zero packet dissapearence "feature"
michael
parents: 703
diff changeset
822 avi->non_interleaved= 1;
594a9b0cacf5 reverse zero packet dissapearence "feature"
michael
parents: 703
diff changeset
823 else
1522
68620a6be643 fix support for avis with sample_size > packet size
michael
parents: 1489
diff changeset
824 av_add_index_entry(st, pos, ast->cum_len / FFMAX(1, ast->sample_size), len, 0, (flags&AVIIF_INDEX) ? AVINDEX_KEYFRAME : 0);
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
825 if(ast->sample_size)
1522
68620a6be643 fix support for avis with sample_size > packet size
michael
parents: 1489
diff changeset
826 ast->cum_len += len;
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
827 else
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
828 ast->cum_len ++;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
829 last_pos= pos;
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
830 }
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
831 return 0;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
832 }
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
833
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
834 static int guess_ni_flag(AVFormatContext *s){
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
835 int i;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
836 int64_t last_start=0;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
837 int64_t first_end= INT64_MAX;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
838
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
839 for(i=0; i<s->nb_streams; i++){
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
840 AVStream *st = s->streams[i];
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
841 int n= st->nb_index_entries;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
842
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
843 if(n <= 0)
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
844 continue;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
845
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
846 if(st->index_entries[0].pos > last_start)
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
847 last_start= st->index_entries[0].pos;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
848 if(st->index_entries[n-1].pos < first_end)
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
849 first_end= st->index_entries[n-1].pos;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
850 }
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
851 return last_start > first_end;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
852 }
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
853
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
854 static int avi_load_index(AVFormatContext *s)
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
855 {
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
856 AVIContext *avi = s->priv_data;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
857 ByteIOContext *pb = &s->pb;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
858 uint32_t tag, size;
343
538e6791f4c7 fixing some seek failure issues
michael
parents: 340
diff changeset
859 offset_t pos= url_ftell(pb);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
860
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
861 url_fseek(pb, avi->movi_end, SEEK_SET);
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
862 #ifdef DEBUG_SEEK
1443
404048ea11bc Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents: 1441
diff changeset
863 printf("movi_end=0x%"PRIx64"\n", avi->movi_end);
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
864 #endif
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
865 for(;;) {
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
866 if (url_feof(pb))
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
867 break;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
868 tag = get_le32(pb);
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
869 size = get_le32(pb);
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
870 #ifdef DEBUG_SEEK
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
871 printf("tag=%c%c%c%c size=0x%x\n",
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
872 tag & 0xff,
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
873 (tag >> 8) & 0xff,
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
874 (tag >> 16) & 0xff,
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
875 (tag >> 24) & 0xff,
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
876 size);
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
877 #endif
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
878 switch(tag) {
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
879 case MKTAG('i', 'd', 'x', '1'):
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
880 if (avi_read_idx1(s, size) < 0)
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
881 goto skip;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
882 else
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
883 goto the_end;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
884 break;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
885 default:
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
886 skip:
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
887 size += (size & 1);
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
888 url_fskip(pb, size);
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
889 break;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
890 }
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
891 }
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
892 the_end:
343
538e6791f4c7 fixing some seek failure issues
michael
parents: 340
diff changeset
893 url_fseek(pb, pos, SEEK_SET);
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
894 return 0;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
895 }
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
896
558
89bd76208427 100l (forgoten seeking functions)
michael
parents: 534
diff changeset
897 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
898 {
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
899 AVIContext *avi = s->priv_data;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
900 AVStream *st;
700
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
901 int i, index;
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
902 int64_t pos;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
903
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
904 if (!avi->index_loaded) {
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
905 /* we only load the index on demand */
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
906 avi_load_index(s);
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
907 avi->index_loaded = 1;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
908 }
700
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
909 assert(stream_index>= 0);
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
910
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
911 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
912 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
913 if(index<0)
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
914 return -1;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
915
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
916 /* find the position */
700
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
917 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
918 timestamp = st->index_entries[index].timestamp;
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
919
1443
404048ea11bc Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents: 1441
diff changeset
920 // av_log(NULL, AV_LOG_DEBUG, "XX %"PRId64" %d %"PRId64"\n", timestamp, index, st->index_entries[index].timestamp);
700
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
921
1629
aedce96c28ff * Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents: 1527
diff changeset
922 if (ENABLE_DV_DEMUXER && avi->dv_demux) {
aedce96c28ff * Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents: 1527
diff changeset
923 /* One and only one real stream for DV in AVI, and it has video */
aedce96c28ff * Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents: 1527
diff changeset
924 /* offsets. Calling with other stream indices should have failed */
aedce96c28ff * Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents: 1527
diff changeset
925 /* the av_index_search_timestamp call above. */
aedce96c28ff * Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents: 1527
diff changeset
926 assert(stream_index == 0);
aedce96c28ff * Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents: 1527
diff changeset
927
aedce96c28ff * Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents: 1527
diff changeset
928 /* Feed the DV video stream version of the timestamp to the */
aedce96c28ff * Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents: 1527
diff changeset
929 /* DV demux so it can synth correct timestamps */
aedce96c28ff * Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents: 1527
diff changeset
930 dv_offset_reset(avi->dv_demux, timestamp);
aedce96c28ff * Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents: 1527
diff changeset
931
aedce96c28ff * Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents: 1527
diff changeset
932 url_fseek(&s->pb, pos, SEEK_SET);
aedce96c28ff * Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents: 1527
diff changeset
933 avi->stream_index= -1;
aedce96c28ff * Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents: 1527
diff changeset
934 return 0;
aedce96c28ff * Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents: 1527
diff changeset
935 }
aedce96c28ff * Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents: 1527
diff changeset
936
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
937 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
938 AVStream *st2 = s->streams[i];
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
939 AVIStream *ast2 = st2->priv_data;
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
940
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
941 ast2->packet_size=
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
942 ast2->remaining= 0;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
943
700
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
944 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
945 continue;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
946
988
fb8b2bb9f716 fixing demuxing of minorityreport.AVI
michael
parents: 984
diff changeset
947 // assert(st2->codec->block_align);
700
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
948 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
949 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
950 index = av_index_search_timestamp(
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
951 st2,
700
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
952 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
953 flags | AVSEEK_FLAG_BACKWARD);
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
954 if(index<0)
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
955 index=0;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
956
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
957 if(!avi->non_interleaved){
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
958 while(index>0 && st2->index_entries[index].pos > pos)
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
959 index--;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
960 while(index+1 < st2->nb_index_entries && st2->index_entries[index].pos < pos)
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
961 index++;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
962 }
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
963
1443
404048ea11bc Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents: 1441
diff changeset
964 // av_log(NULL, AV_LOG_DEBUG, "%"PRId64" %d %"PRId64"\n", timestamp, index, st2->index_entries[index].timestamp);
700
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
965 /* extract the current frame number */
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
966 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
967 if(ast2->sample_size)
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
968 ast2->frame_offset *=ast2->sample_size;
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
969 }
700
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
970
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
971 /* do the seek */
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
972 url_fseek(&s->pb, pos, SEEK_SET);
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
973 avi->stream_index= -1;
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
974 return 0;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
975 }
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
976
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
977 static int avi_read_close(AVFormatContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
978 {
110
9fd9b0f9e9d8 memleaks
michaelni
parents: 98
diff changeset
979 int i;
9fd9b0f9e9d8 memleaks
michaelni
parents: 98
diff changeset
980 AVIContext *avi = s->priv_data;
9fd9b0f9e9d8 memleaks
michaelni
parents: 98
diff changeset
981
9fd9b0f9e9d8 memleaks
michaelni
parents: 98
diff changeset
982 for(i=0;i<s->nb_streams;i++) {
9fd9b0f9e9d8 memleaks
michaelni
parents: 98
diff changeset
983 AVStream *st = s->streams[i];
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
984 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
985 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
986 av_free(st->codec->palctrl);
110
9fd9b0f9e9d8 memleaks
michaelni
parents: 98
diff changeset
987 }
9fd9b0f9e9d8 memleaks
michaelni
parents: 98
diff changeset
988
262
f174d9c00bce * DV handling was streamlined for both muxing/demuxing and
romansh
parents: 227
diff changeset
989 if (avi->dv_demux)
f174d9c00bce * DV handling was streamlined for both muxing/demuxing and
romansh
parents: 227
diff changeset
990 av_free(avi->dv_demux);
f174d9c00bce * DV handling was streamlined for both muxing/demuxing and
romansh
parents: 227
diff changeset
991
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
992 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
993 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
994
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
995 static int avi_probe(AVProbeData *p)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
996 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
997 /* check file header */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
998 if (p->buf_size <= 32)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
999 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1000 if (p->buf[0] == 'R' && p->buf[1] == 'I' &&
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1001 p->buf[2] == 'F' && p->buf[3] == 'F' &&
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1002 p->buf[8] == 'A' && p->buf[9] == 'V' &&
1761
e9bff647e326 supporting files with A,V,I,0x19 header
michael
parents: 1758
diff changeset
1003 p->buf[10] == 'I' && (p->buf[11] == ' ' || p->buf[11] == 0x19))
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1004 return AVPROBE_SCORE_MAX;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1005 else
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1006 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1007 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1008
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
1009 AVInputFormat avi_demuxer = {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1010 "avi",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1011 "avi format",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1012 sizeof(AVIContext),
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1013 avi_probe,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1014 avi_read_header,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1015 avi_read_packet,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1016 avi_read_close,
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
1017 avi_read_seek,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1018 };