annotate avidec.c @ 1345:0a74030d9dd7 libavformat

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