annotate avidec.c @ 5565:befe2f0f9a00 libavformat

Use the configure check from r21351 and use it to properly define struct sockaddr (in case it's not missing) so it always works on the system that we are defining it for, in a RFC-2553/3493-compliant way (i.e. containing a ss_family field). which is used in udp.c. Patch by Martin Storsj <$firstname $firstname st>.
author rbultje
date Wed, 20 Jan 2010 17:26:14 +0000
parents 7698da6e1f0a
children d8bfadee68a0
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1 /*
1415
3b00fb8ef8e4 replace coder/decoder file description in libavformat by muxer/demuxer
aurel
parents: 1358
diff changeset
2 * AVI demuxer
3538
e50efb387048 spelling cosmetics
diego
parents: 3487
diff changeset
3 * Copyright (c) 2001 Fabrice Bellard
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
4 *
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1298
diff changeset
5 * This file is part of FFmpeg.
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1298
diff changeset
6 *
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1298
diff changeset
7 * FFmpeg is free software; you can redistribute it and/or
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
8 * modify it under the terms of the GNU Lesser General Public
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
9 * License as published by the Free Software Foundation; either
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1298
diff changeset
10 * version 2.1 of the License, or (at your option) any later version.
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
11 *
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1298
diff changeset
12 * FFmpeg is distributed in the hope that it will be useful,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
15 * Lesser General Public License for more details.
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
16 *
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
17 * You should have received a copy of the GNU Lesser General Public
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1298
diff changeset
18 * License along with FFmpeg; if not, write to the Free Software
896
edbe5c3717f9 Update licensing information: The FSF changed postal address.
diego
parents: 887
diff changeset
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
20 */
4203
27d9df19f066 AVI: add bswap.h include needed on big endian
mru
parents: 4154
diff changeset
21
4956
95ea72d4e51d move DEBUG define before include to get dprintf and change printf to dprintf
bcoudurier
parents: 4753
diff changeset
22 //#define DEBUG
95ea72d4e51d move DEBUG define before include to get dprintf and change printf to dprintf
bcoudurier
parents: 4753
diff changeset
23 //#define DEBUG_SEEK
95ea72d4e51d move DEBUG define before include to get dprintf and change printf to dprintf
bcoudurier
parents: 4753
diff changeset
24
4243
964903243e66 remove ff_get_fourcc() and use AV_RL32() instead
aurel
parents: 4230
diff changeset
25 #include "libavutil/intreadwrite.h"
4203
27d9df19f066 AVI: add bswap.h include needed on big endian
mru
parents: 4154
diff changeset
26 #include "libavutil/bswap.h"
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
27 #include "avformat.h"
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
28 #include "avi.h"
262
f174d9c00bce * DV handling was streamlined for both muxing/demuxing and
romansh
parents: 227
diff changeset
29 #include "dv.h"
1172
6a5e58d2114b move common stuff from avienc.c and wav.c to new file riff.c
mru
parents: 1169
diff changeset
30 #include "riff.h"
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
31
700
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
32 #undef NDEBUG
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
33 #include <assert.h>
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
34
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
35 typedef struct AVIStream {
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
36 int64_t frame_offset; /* current frame (video) or byte (audio) counter
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
37 (used to compute the pts) */
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
38 int remaining;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
39 int packet_size;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
40
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
41 int scale;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
42 int rate;
982
c21f07d85158 10l forgot to set packet_size
michael
parents: 981
diff changeset
43 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
44
977
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
45 int64_t cum_len; /* temporary storage (used during seek) */
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
46
519
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
47 int prefix; ///< normally 'd'<<8 + 'c' or 'w'<<8 + 'b'
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
48 int prefix_count;
3157
27c5bc69a1f9 One non functional AVPalette chunk less, one heap overflow less.
michael
parents: 3105
diff changeset
49 uint32_t pal[256];
27c5bc69a1f9 One non functional AVPalette chunk less, one heap overflow less.
michael
parents: 3105
diff changeset
50 int has_pal;
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
51 } AVIStream;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
52
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
53 typedef struct {
262
f174d9c00bce * DV handling was streamlined for both muxing/demuxing and
romansh
parents: 227
diff changeset
54 int64_t riff_end;
f174d9c00bce * DV handling was streamlined for both muxing/demuxing and
romansh
parents: 227
diff changeset
55 int64_t movi_end;
2383
4cd9594b588d do not misuse movi_end for checking chunk sizes
michael
parents: 2315
diff changeset
56 int64_t fsize;
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3908
diff changeset
57 int64_t movi_list;
3984
46fc6e792241 Favor even chunk sizes in ambiguous cases.
michael
parents: 3983
diff changeset
58 int64_t last_pkt_pos;
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
59 int index_loaded;
510
133287132e1d * simplifying OpenDML AVI handling.
romansh
parents: 495
diff changeset
60 int is_odml;
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
61 int non_interleaved;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
62 int stream_index;
296
252946de6d3f * DV demuxer is now capable of decoding auxilary audio stream. So,
romansh
parents: 262
diff changeset
63 DVDemuxContext* dv_demux;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
64 } AVIContext;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
65
2578
57e0c1296dfe use a table to parse AVI file header
aurel
parents: 2384
diff changeset
66 static const char avi_headers[][8] = {
57e0c1296dfe use a table to parse AVI file header
aurel
parents: 2384
diff changeset
67 { 'R', 'I', 'F', 'F', 'A', 'V', 'I', ' ' },
57e0c1296dfe use a table to parse AVI file header
aurel
parents: 2384
diff changeset
68 { 'R', 'I', 'F', 'F', 'A', 'V', 'I', 'X' },
57e0c1296dfe use a table to parse AVI file header
aurel
parents: 2384
diff changeset
69 { 'R', 'I', 'F', 'F', 'A', 'V', 'I', 0x19},
2579
6eb2b7b42bfe add support for AVI files with On2 header
aurel
parents: 2578
diff changeset
70 { 'O', 'N', '2', ' ', 'O', 'N', '2', 'f' },
2584
4630871ef965 Add support for AMV variants of AVI files.
diego
parents: 2579
diff changeset
71 { 'R', 'I', 'F', 'F', 'A', 'M', 'V', ' ' },
2578
57e0c1296dfe use a table to parse AVI file header
aurel
parents: 2384
diff changeset
72 { 0 }
57e0c1296dfe use a table to parse AVI file header
aurel
parents: 2384
diff changeset
73 };
57e0c1296dfe use a table to parse AVI file header
aurel
parents: 2384
diff changeset
74
469
6a4cc19e8d9b exporting keyframe flags, fixes keyframe stuff with streamcopy
michael
parents: 466
diff changeset
75 static int avi_load_index(AVFormatContext *s);
979
d2e5dfdf4def add size to AVIndex
michael
parents: 977
diff changeset
76 static int guess_ni_flag(AVFormatContext *s);
469
6a4cc19e8d9b exporting keyframe flags, fixes keyframe stuff with streamcopy
michael
parents: 466
diff changeset
77
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
78 #ifdef DEBUG
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
79 static void print_tag(const char *str, unsigned int tag, int size)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
80 {
4956
95ea72d4e51d move DEBUG define before include to get dprintf and change printf to dprintf
bcoudurier
parents: 4753
diff changeset
81 dprintf(NULL, "%s: tag=%c%c%c%c size=0x%x\n",
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
82 str, tag & 0xff,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
83 (tag >> 8) & 0xff,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
84 (tag >> 16) & 0xff,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
85 (tag >> 24) & 0xff,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
86 size);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
87 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
88 #endif
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
89
4515
1d9ace1dec78 Add a context to av_log() calls and modify a function prototype to allow it.
benoit
parents: 4353
diff changeset
90 static int get_riff(AVFormatContext *s, ByteIOContext *pb)
92
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
91 {
4515
1d9ace1dec78 Add a context to av_log() calls and modify a function prototype to allow it.
benoit
parents: 4353
diff changeset
92 AVIContext *avi = s->priv_data;
2578
57e0c1296dfe use a table to parse AVI file header
aurel
parents: 2384
diff changeset
93 char header[8];
57e0c1296dfe use a table to parse AVI file header
aurel
parents: 2384
diff changeset
94 int i;
57e0c1296dfe use a table to parse AVI file header
aurel
parents: 2384
diff changeset
95
92
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
96 /* check RIFF header */
2578
57e0c1296dfe use a table to parse AVI file header
aurel
parents: 2384
diff changeset
97 get_buffer(pb, header, 4);
92
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
98 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
99 avi->riff_end += url_ftell(pb); /* RIFF chunk end */
2578
57e0c1296dfe use a table to parse AVI file header
aurel
parents: 2384
diff changeset
100 get_buffer(pb, header+4, 4);
57e0c1296dfe use a table to parse AVI file header
aurel
parents: 2384
diff changeset
101
57e0c1296dfe use a table to parse AVI file header
aurel
parents: 2384
diff changeset
102 for(i=0; avi_headers[i][0]; i++)
57e0c1296dfe use a table to parse AVI file header
aurel
parents: 2384
diff changeset
103 if(!memcmp(header, avi_headers[i], 8))
57e0c1296dfe use a table to parse AVI file header
aurel
parents: 2384
diff changeset
104 break;
57e0c1296dfe use a table to parse AVI file header
aurel
parents: 2384
diff changeset
105 if(!avi_headers[i][0])
57e0c1296dfe use a table to parse AVI file header
aurel
parents: 2384
diff changeset
106 return -1;
57e0c1296dfe use a table to parse AVI file header
aurel
parents: 2384
diff changeset
107
57e0c1296dfe use a table to parse AVI file header
aurel
parents: 2384
diff changeset
108 if(header[7] == 0x19)
4515
1d9ace1dec78 Add a context to av_log() calls and modify a function prototype to allow it.
benoit
parents: 4353
diff changeset
109 av_log(s, AV_LOG_INFO, "This file has been generated by a totally broken muxer.\n");
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
110
92
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
111 return 0;
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
112 }
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
113
977
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
114 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
115 AVIContext *avi = s->priv_data;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2584
diff changeset
116 ByteIOContext *pb = s->pb;
977
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
117 int longs_pre_entry= get_le16(pb);
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
118 int index_sub_type = get_byte(pb);
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
119 int index_type = get_byte(pb);
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
120 int entries_in_use = get_le32(pb);
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
121 int chunk_id = get_le32(pb);
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
122 int64_t base = get_le64(pb);
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
123 int stream_id= 10*((chunk_id&0xFF) - '0') + (((chunk_id>>8)&0xFF) - '0');
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
124 AVStream *st;
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
125 AVIStream *ast;
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
126 int i;
984
b644fe79f7a2 fixing av sync in videotest.avi (index doesnt match chunks, header doesnt indicate that)
michael
parents: 983
diff changeset
127 int64_t last_pos= -1;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2584
diff changeset
128 int64_t filesize= url_fsize(s->pb);
977
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
129
1277
e27e94ac0c4b support some totally broken ODML variant
michael
parents: 1256
diff changeset
130 #ifdef DEBUG_SEEK
1443
404048ea11bc Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents: 1441
diff changeset
131 av_log(s, AV_LOG_ERROR, "longs_pre_entry:%d index_type:%d entries_in_use:%d chunk_id:%X base:%16"PRIX64"\n",
1277
e27e94ac0c4b support some totally broken ODML variant
michael
parents: 1256
diff changeset
132 longs_pre_entry,index_type, entries_in_use, chunk_id, base);
e27e94ac0c4b support some totally broken ODML variant
michael
parents: 1256
diff changeset
133 #endif
977
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
134
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
135 if(stream_id > s->nb_streams || stream_id < 0)
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
136 return -1;
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
137 st= s->streams[stream_id];
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
138 ast = st->priv_data;
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
139
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
140 if(index_sub_type)
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
141 return -1;
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
142
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
143 get_le32(pb);
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
144
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
145 if(index_type && longs_pre_entry != 2)
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
146 return -1;
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
147 if(index_type>1)
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
148 return -1;
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
149
1277
e27e94ac0c4b support some totally broken ODML variant
michael
parents: 1256
diff changeset
150 if(filesize > 0 && base >= filesize){
e27e94ac0c4b support some totally broken ODML variant
michael
parents: 1256
diff changeset
151 av_log(s, AV_LOG_ERROR, "ODML index invalid\n");
e27e94ac0c4b support some totally broken ODML variant
michael
parents: 1256
diff changeset
152 if(base>>32 == (base & 0xFFFFFFFF) && (base & 0xFFFFFFFF) < filesize && filesize <= 0xFFFFFFFF)
e27e94ac0c4b support some totally broken ODML variant
michael
parents: 1256
diff changeset
153 base &= 0xFFFFFFFF;
e27e94ac0c4b support some totally broken ODML variant
michael
parents: 1256
diff changeset
154 else
e27e94ac0c4b support some totally broken ODML variant
michael
parents: 1256
diff changeset
155 return -1;
e27e94ac0c4b support some totally broken ODML variant
michael
parents: 1256
diff changeset
156 }
e27e94ac0c4b support some totally broken ODML variant
michael
parents: 1256
diff changeset
157
977
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
158 for(i=0; i<entries_in_use; i++){
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
159 if(index_type){
979
d2e5dfdf4def add size to AVIndex
michael
parents: 977
diff changeset
160 int64_t pos= get_le32(pb) + base - 8;
977
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
161 int len = get_le32(pb);
979
d2e5dfdf4def add size to AVIndex
michael
parents: 977
diff changeset
162 int key= len >= 0;
d2e5dfdf4def add size to AVIndex
michael
parents: 977
diff changeset
163 len &= 0x7FFFFFFF;
977
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
164
1277
e27e94ac0c4b support some totally broken ODML variant
michael
parents: 1256
diff changeset
165 #ifdef DEBUG_SEEK
1443
404048ea11bc Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents: 1441
diff changeset
166 av_log(s, AV_LOG_ERROR, "pos:%"PRId64", len:%X\n", pos, len);
1277
e27e94ac0c4b support some totally broken ODML variant
michael
parents: 1256
diff changeset
167 #endif
4554
e219c0cdcf8a Check for EOF during index reading.
michael
parents: 4552
diff changeset
168 if(url_feof(pb))
e219c0cdcf8a Check for EOF during index reading.
michael
parents: 4552
diff changeset
169 return -1;
e219c0cdcf8a Check for EOF during index reading.
michael
parents: 4552
diff changeset
170
984
b644fe79f7a2 fixing av sync in videotest.avi (index doesnt match chunks, header doesnt indicate that)
michael
parents: 983
diff changeset
171 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
172 avi->non_interleaved= 1;
5327
a8e26981c104 Fix infinite loop with size==0 && sample_size!=0 in non interleaved avis.
michael
parents: 5326
diff changeset
173 if(last_pos != pos && (len || !ast->sample_size))
5326
4e1e9ab777a1 Support non interleaved avi files that have 0<size<sample_size.
michael
parents: 5243
diff changeset
174 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
175
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
176 if(ast->sample_size)
1522
68620a6be643 fix support for avis with sample_size > packet size
michael
parents: 1489
diff changeset
177 ast->cum_len += len;
977
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
178 else
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
179 ast->cum_len ++;
984
b644fe79f7a2 fixing av sync in videotest.avi (index doesnt match chunks, header doesnt indicate that)
michael
parents: 983
diff changeset
180 last_pos= pos;
977
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
181 }else{
1144
d3a8c634106f kill warnings
mru
parents: 1120
diff changeset
182 int64_t offset, pos;
d3a8c634106f kill warnings
mru
parents: 1120
diff changeset
183 int duration;
d3a8c634106f kill warnings
mru
parents: 1120
diff changeset
184 offset = get_le64(pb);
d3a8c634106f kill warnings
mru
parents: 1120
diff changeset
185 get_le32(pb); /* size */
d3a8c634106f kill warnings
mru
parents: 1120
diff changeset
186 duration = get_le32(pb);
4554
e219c0cdcf8a Check for EOF during index reading.
michael
parents: 4552
diff changeset
187
e219c0cdcf8a Check for EOF during index reading.
michael
parents: 4552
diff changeset
188 if(url_feof(pb))
e219c0cdcf8a Check for EOF during index reading.
michael
parents: 4552
diff changeset
189 return -1;
e219c0cdcf8a Check for EOF during index reading.
michael
parents: 4552
diff changeset
190
1144
d3a8c634106f kill warnings
mru
parents: 1120
diff changeset
191 pos = url_ftell(pb);
977
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
192
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
193 url_fseek(pb, offset+8, SEEK_SET);
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
194 read_braindead_odml_indx(s, frame_num);
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
195 frame_num += duration;
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
196
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
197 url_fseek(pb, pos, SEEK_SET);
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
198 }
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
199 }
1277
e27e94ac0c4b support some totally broken ODML variant
michael
parents: 1256
diff changeset
200 avi->index_loaded=1;
977
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
201 return 0;
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
202 }
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
203
983
558381bf97d2 support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents: 982
diff changeset
204 static void clean_index(AVFormatContext *s){
1277
e27e94ac0c4b support some totally broken ODML variant
michael
parents: 1256
diff changeset
205 int i;
e27e94ac0c4b support some totally broken ODML variant
michael
parents: 1256
diff changeset
206 int64_t j;
983
558381bf97d2 support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents: 982
diff changeset
207
558381bf97d2 support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents: 982
diff changeset
208 for(i=0; i<s->nb_streams; i++){
558381bf97d2 support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents: 982
diff changeset
209 AVStream *st = s->streams[i];
558381bf97d2 support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents: 982
diff changeset
210 AVIStream *ast = st->priv_data;
558381bf97d2 support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents: 982
diff changeset
211 int n= st->nb_index_entries;
558381bf97d2 support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents: 982
diff changeset
212 int max= ast->sample_size;
558381bf97d2 support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents: 982
diff changeset
213 int64_t pos, size, ts;
558381bf97d2 support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents: 982
diff changeset
214
558381bf97d2 support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents: 982
diff changeset
215 if(n != 1 || ast->sample_size==0)
558381bf97d2 support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents: 982
diff changeset
216 continue;
558381bf97d2 support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents: 982
diff changeset
217
558381bf97d2 support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents: 982
diff changeset
218 while(max < 1024) max+=max;
558381bf97d2 support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents: 982
diff changeset
219
558381bf97d2 support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents: 982
diff changeset
220 pos= st->index_entries[0].pos;
558381bf97d2 support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents: 982
diff changeset
221 size= st->index_entries[0].size;
558381bf97d2 support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents: 982
diff changeset
222 ts= st->index_entries[0].timestamp;
558381bf97d2 support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents: 982
diff changeset
223
558381bf97d2 support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents: 982
diff changeset
224 for(j=0; j<size; j+=max){
5326
4e1e9ab777a1 Support non interleaved avi files that have 0<size<sample_size.
michael
parents: 5243
diff changeset
225 av_add_index_entry(st, pos+j, ts+j, FFMIN(max, size-j), 0, AVINDEX_KEYFRAME);
983
558381bf97d2 support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents: 982
diff changeset
226 }
558381bf97d2 support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents: 982
diff changeset
227 }
558381bf97d2 support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents: 982
diff changeset
228 }
558381bf97d2 support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents: 982
diff changeset
229
4149
1f857a4519bd Generic metadata API.
michael
parents: 4117
diff changeset
230 static int avi_read_tag(AVFormatContext *s, const char *key, unsigned int size)
1256
2cddf00f92a6 AVI tag reading and writing patch by David Conrad.
banan
parents: 1172
diff changeset
231 {
4149
1f857a4519bd Generic metadata API.
michael
parents: 4117
diff changeset
232 ByteIOContext *pb = s->pb;
5446
4211f91f69b1 Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents: 5327
diff changeset
233 char *value;
4149
1f857a4519bd Generic metadata API.
michael
parents: 4117
diff changeset
234
1256
2cddf00f92a6 AVI tag reading and writing patch by David Conrad.
banan
parents: 1172
diff changeset
235 size += (size & 1);
4149
1f857a4519bd Generic metadata API.
michael
parents: 4117
diff changeset
236
5446
4211f91f69b1 Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents: 5327
diff changeset
237 if (size == UINT_MAX)
4211f91f69b1 Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents: 5327
diff changeset
238 return -1;
4211f91f69b1 Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents: 5327
diff changeset
239 value = av_malloc(size+1);
4211f91f69b1 Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents: 5327
diff changeset
240 if (!value)
4211f91f69b1 Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents: 5327
diff changeset
241 return -1;
4211f91f69b1 Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents: 5327
diff changeset
242 get_strz(pb, value, size);
4211f91f69b1 Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents: 5327
diff changeset
243
4211f91f69b1 Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents: 5327
diff changeset
244 return av_metadata_set2(&s->metadata, key, value,
4211f91f69b1 Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
michael
parents: 5327
diff changeset
245 AV_METADATA_DONT_STRDUP_VAL);
1256
2cddf00f92a6 AVI tag reading and writing patch by David Conrad.
banan
parents: 1172
diff changeset
246 }
2cddf00f92a6 AVI tag reading and writing patch by David Conrad.
banan
parents: 1172
diff changeset
247
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
248 static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
249 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
250 AVIContext *avi = s->priv_data;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2584
diff changeset
251 ByteIOContext *pb = s->pb;
4230
de3cb095285c Make unsigned int a variable that does not need to be explicitely 32 bits.
benoit
parents: 4210
diff changeset
252 unsigned int tag, tag1, handler;
703
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
253 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
254 unsigned int size, nb_frames;
1785
2376ab11ea73 support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents: 1761
diff changeset
255 int i;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
256 AVStream *st;
1144
d3a8c634106f kill warnings
mru
parents: 1120
diff changeset
257 AVIStream *ast = NULL;
2584
4630871ef965 Add support for AMV variants of AVI files.
diego
parents: 2579
diff changeset
258 int avih_width=0, avih_height=0;
4630871ef965 Add support for AMV variants of AVI files.
diego
parents: 2579
diff changeset
259 int amv_file_format=0;
5087
5de39afaca2e Check size of "strf" header against size of enclosing "LIST" if there is one.
reimar
parents: 5058
diff changeset
260 uint64_t list_end = 0;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
261
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
262 avi->stream_index= -1;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
263
4516
3cede8e0a614 avidec: fix error introduced in r17382
mru
parents: 4515
diff changeset
264 if (get_riff(s, pb) < 0)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
265 return -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
266
2383
4cd9594b588d do not misuse movi_end for checking chunk sizes
michael
parents: 2315
diff changeset
267 avi->fsize = url_fsize(pb);
4cd9594b588d do not misuse movi_end for checking chunk sizes
michael
parents: 2315
diff changeset
268 if(avi->fsize<=0)
4753
290a386de8d4 set avi fsize to INT64_MAX if riff tag end is not set and file size is not available
bcoudurier
parents: 4555
diff changeset
269 avi->fsize= avi->riff_end == 8 ? INT64_MAX : avi->riff_end;
2383
4cd9594b588d do not misuse movi_end for checking chunk sizes
michael
parents: 2315
diff changeset
270
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
271 /* first list tag */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
272 stream_index = -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
273 codec_type = -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
274 frame_period = 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
275 for(;;) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
276 if (url_feof(pb))
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
277 goto fail;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
278 tag = get_le32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
279 size = get_le32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
280 #ifdef DEBUG
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
281 print_tag("tag", tag, size);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
282 #endif
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
283
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
284 switch(tag) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
285 case MKTAG('L', 'I', 'S', 'T'):
5087
5de39afaca2e Check size of "strf" header against size of enclosing "LIST" if there is one.
reimar
parents: 5058
diff changeset
286 list_end = url_ftell(pb) + size;
3538
e50efb387048 spelling cosmetics
diego
parents: 3487
diff changeset
287 /* Ignored, except at start of video packets. */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
288 tag1 = get_le32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
289 #ifdef DEBUG
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
290 print_tag("list", tag1, 0);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
291 #endif
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
292 if (tag1 == MKTAG('m', 'o', 'v', 'i')) {
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
293 avi->movi_list = url_ftell(pb) - 4;
1286
8b423c6ae233 Fix for AVI files with odd sized 'movi' list
gpoirier
parents: 1277
diff changeset
294 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
295 else avi->movi_end = url_fsize(pb);
4956
95ea72d4e51d move DEBUG define before include to get dprintf and change printf to dprintf
bcoudurier
parents: 4753
diff changeset
296 dprintf(NULL, "movi end=%"PRIx64"\n", avi->movi_end);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
297 goto end_of_header;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
298 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
299 break;
510
133287132e1d * simplifying OpenDML AVI handling.
romansh
parents: 495
diff changeset
300 case MKTAG('d', 'm', 'l', 'h'):
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
301 avi->is_odml = 1;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
302 url_fskip(pb, size + (size & 1));
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
303 break;
2584
4630871ef965 Add support for AMV variants of AVI files.
diego
parents: 2579
diff changeset
304 case MKTAG('a', 'm', 'v', 'h'):
4630871ef965 Add support for AMV variants of AVI files.
diego
parents: 2579
diff changeset
305 amv_file_format=1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
306 case MKTAG('a', 'v', 'i', 'h'):
3538
e50efb387048 spelling cosmetics
diego
parents: 3487
diff changeset
307 /* AVI header */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
308 /* using frame_period is bad idea */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
309 frame_period = get_le32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
310 bit_rate = get_le32(pb) * 8;
981
55519fa957c3 fix demuxing of XviD_with_3_AAC-HE_audio_streams.avi
michael
parents: 980
diff changeset
311 get_le32(pb);
55519fa957c3 fix demuxing of XviD_with_3_AAC-HE_audio_streams.avi
michael
parents: 980
diff changeset
312 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
313
55519fa957c3 fix demuxing of XviD_with_3_AAC-HE_audio_streams.avi
michael
parents: 980
diff changeset
314 url_fskip(pb, 2 * 4);
1785
2376ab11ea73 support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents: 1761
diff changeset
315 get_le32(pb);
2584
4630871ef965 Add support for AMV variants of AVI files.
diego
parents: 2579
diff changeset
316 get_le32(pb);
4630871ef965 Add support for AMV variants of AVI files.
diego
parents: 2579
diff changeset
317 avih_width=get_le32(pb);
4630871ef965 Add support for AMV variants of AVI files.
diego
parents: 2579
diff changeset
318 avih_height=get_le32(pb);
1785
2376ab11ea73 support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents: 1761
diff changeset
319
2584
4630871ef965 Add support for AMV variants of AVI files.
diego
parents: 2579
diff changeset
320 url_fskip(pb, size - 10 * 4);
1785
2376ab11ea73 support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents: 1761
diff changeset
321 break;
2376ab11ea73 support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents: 1761
diff changeset
322 case MKTAG('s', 't', 'r', 'h'):
2376ab11ea73 support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents: 1761
diff changeset
323 /* stream header */
2376ab11ea73 support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents: 1761
diff changeset
324
2376ab11ea73 support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents: 1761
diff changeset
325 tag1 = get_le32(pb);
2376ab11ea73 support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents: 1761
diff changeset
326 handler = get_le32(pb); /* codec tag */
2376ab11ea73 support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents: 1761
diff changeset
327
2376ab11ea73 support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents: 1761
diff changeset
328 if(tag1 == MKTAG('p', 'a', 'd', 's')){
2376ab11ea73 support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents: 1761
diff changeset
329 url_fskip(pb, size - 8);
2376ab11ea73 support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents: 1761
diff changeset
330 break;
2376ab11ea73 support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents: 1761
diff changeset
331 }else{
2376ab11ea73 support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents: 1761
diff changeset
332 stream_index++;
2376ab11ea73 support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents: 1761
diff changeset
333 st = av_new_stream(s, stream_index);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
334 if (!st)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
335 goto fail;
462
b69898ffc92a move time_base (pts_num/pts_den) from AVFormatContext -> AVStream
michael
parents: 457
diff changeset
336
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
337 ast = av_mallocz(sizeof(AVIStream));
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
338 if (!ast)
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
339 goto fail;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
340 st->priv_data = ast;
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
341 }
2584
4630871ef965 Add support for AMV variants of AVI files.
diego
parents: 2579
diff changeset
342 if(amv_file_format)
4630871ef965 Add support for AMV variants of AVI files.
diego
parents: 2579
diff changeset
343 tag1 = stream_index ? MKTAG('a','u','d','s') : MKTAG('v','i','d','s');
1785
2376ab11ea73 support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents: 1761
diff changeset
344
471
8b7a8dccde70 skip subtitle streams instead of perishing
michael
parents: 469
diff changeset
345 #ifdef DEBUG
1441
ad3b03b7b142 reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents: 1415
diff changeset
346 print_tag("strh", tag1, -1);
471
8b7a8dccde70 skip subtitle streams instead of perishing
michael
parents: 469
diff changeset
347 #endif
703
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
348 if(tag1 == MKTAG('i', 'a', 'v', 's') || tag1 == MKTAG('i', 'v', 'a', 's')){
1629
aedce96c28ff * Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents: 1527
diff changeset
349 int64_t dv_dur;
aedce96c28ff * Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents: 1527
diff changeset
350
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
351 /*
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
352 * After some consideration -- I don't think we
3538
e50efb387048 spelling cosmetics
diego
parents: 3487
diff changeset
353 * have to support anything but DV in type1 AVIs.
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
354 */
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
355 if (s->nb_streams != 1)
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
356 goto fail;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
357
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
358 if (handler != MKTAG('d', 'v', 's', 'd') &&
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
359 handler != MKTAG('d', 'v', 'h', 'd') &&
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
360 handler != MKTAG('d', 'v', 's', 'l'))
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
361 goto fail;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
362
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
363 ast = s->streams[0]->priv_data;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
364 av_freep(&s->streams[0]->codec->extradata);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
365 av_freep(&s->streams[0]);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
366 s->nb_streams = 0;
4210
ec95366371ba replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
aurel
parents: 4203
diff changeset
367 if (CONFIG_DV_DEMUXER) {
1489
40290ec3d034 cosmetic: fix indentation after previous commit
aurel
parents: 1488
diff changeset
368 avi->dv_demux = dv_init_demux(s);
40290ec3d034 cosmetic: fix indentation after previous commit
aurel
parents: 1488
diff changeset
369 if (!avi->dv_demux)
40290ec3d034 cosmetic: fix indentation after previous commit
aurel
parents: 1488
diff changeset
370 goto fail;
1488
41a7ed2b064a Fix avidec.c compilation when dv demuxer is disabled.
aurel
parents: 1472
diff changeset
371 }
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
372 s->streams[0]->priv_data = ast;
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
373 url_fskip(pb, 3 * 4);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
374 ast->scale = get_le32(pb);
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
375 ast->rate = get_le32(pb);
1629
aedce96c28ff * Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents: 1527
diff changeset
376 url_fskip(pb, 4); /* start time */
aedce96c28ff * Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents: 1527
diff changeset
377
aedce96c28ff * Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents: 1527
diff changeset
378 dv_dur = get_le32(pb);
aedce96c28ff * Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents: 1527
diff changeset
379 if (ast->scale > 0 && ast->rate > 0 && dv_dur > 0) {
aedce96c28ff * Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents: 1527
diff changeset
380 dv_dur *= AV_TIME_BASE;
aedce96c28ff * Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents: 1527
diff changeset
381 s->duration = av_rescale(dv_dur, ast->scale, ast->rate);
aedce96c28ff * Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents: 1527
diff changeset
382 }
aedce96c28ff * Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents: 1527
diff changeset
383 /*
aedce96c28ff * Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents: 1527
diff changeset
384 * else, leave duration alone; timing estimation in utils.c
3538
e50efb387048 spelling cosmetics
diego
parents: 3487
diff changeset
385 * will make a guess based on bitrate.
1629
aedce96c28ff * Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents: 1527
diff changeset
386 */
aedce96c28ff * Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents: 1527
diff changeset
387
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
388 stream_index = s->nb_streams - 1;
1629
aedce96c28ff * Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents: 1527
diff changeset
389 url_fskip(pb, size - 9*4);
703
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
390 break;
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
391 }
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
392
1785
2376ab11ea73 support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents: 1761
diff changeset
393 assert(stream_index < s->nb_streams);
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
394 st->codec->stream_codec_tag= handler;
703
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
395
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
396 get_le32(pb); /* flags */
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
397 get_le16(pb); /* priority */
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
398 get_le16(pb); /* language */
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
399 get_le32(pb); /* initial frame */
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
400 ast->scale = get_le32(pb);
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
401 ast->rate = get_le32(pb);
3210
7adc8fcec695 Restructure if/else a little.
michael
parents: 3185
diff changeset
402 if(!(ast->scale && ast->rate)){
3538
e50efb387048 spelling cosmetics
diego
parents: 3487
diff changeset
403 av_log(s, AV_LOG_WARNING, "scale/rate is %u/%u which is invalid. (This file has been generated by broken software.)\n", ast->scale, ast->rate);
3211
michael
parents: 3210
diff changeset
404 if(frame_period){
michael
parents: 3210
diff changeset
405 ast->rate = 1000000;
michael
parents: 3210
diff changeset
406 ast->scale = frame_period;
michael
parents: 3210
diff changeset
407 }else{
michael
parents: 3210
diff changeset
408 ast->rate = 25;
michael
parents: 3210
diff changeset
409 ast->scale = 1;
michael
parents: 3210
diff changeset
410 }
3210
7adc8fcec695 Restructure if/else a little.
michael
parents: 3185
diff changeset
411 }
703
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
412 av_set_pts_info(st, 64, ast->scale, ast->rate);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
413
989
e4eb95d550ca dwstart support
michael
parents: 988
diff changeset
414 ast->cum_len=get_le32(pb); /* start */
703
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
415 nb_frames = get_le32(pb);
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
416
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
417 st->start_time = 0;
743
af4e24d6310c switch to native time bases
michael
parents: 718
diff changeset
418 st->duration = nb_frames;
703
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
419 get_le32(pb); /* buffer size */
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
420 get_le32(pb); /* quality */
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
421 ast->sample_size = get_le32(pb); /* sample ssize */
1522
68620a6be643 fix support for avis with sample_size > packet size
michael
parents: 1489
diff changeset
422 ast->cum_len *= FFMAX(1, ast->sample_size);
4515
1d9ace1dec78 Add a context to av_log() calls and modify a function prototype to allow it.
benoit
parents: 4353
diff changeset
423 // av_log(s, AV_LOG_DEBUG, "%d %d %d %d\n", ast->rate, ast->scale, ast->start, ast->sample_size);
703
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
424
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
425 switch(tag1) {
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
426 case MKTAG('v', 'i', 'd', 's'):
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
427 codec_type = CODEC_TYPE_VIDEO;
75
78bec272ce3a read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents: 73
diff changeset
428
703
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
429 ast->sample_size = 0;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
430 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
431 case MKTAG('a', 'u', 'd', 's'):
703
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
432 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
433 break;
471
8b7a8dccde70 skip subtitle streams instead of perishing
michael
parents: 469
diff changeset
434 case MKTAG('t', 'x', 't', 's'):
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
435 //FIXME
471
8b7a8dccde70 skip subtitle streams instead of perishing
michael
parents: 469
diff changeset
436 codec_type = CODEC_TYPE_DATA; //CODEC_TYPE_SUB ? FIXME
8b7a8dccde70 skip subtitle streams instead of perishing
michael
parents: 469
diff changeset
437 break;
3479
148bb3992e46 Parse 'dats' as data.
benoit
parents: 3424
diff changeset
438 case MKTAG('d', 'a', 't', 's'):
148bb3992e46 Parse 'dats' as data.
benoit
parents: 3424
diff changeset
439 codec_type = CODEC_TYPE_DATA;
148bb3992e46 Parse 'dats' as data.
benoit
parents: 3424
diff changeset
440 break;
73
d40ddc73858a reversing not yet reversed changes from r1.7 -> r1.8 except the static/const stuff
michaelni
parents: 65
diff changeset
441 default:
534
3846c006af2b pads stream
michael
parents: 526
diff changeset
442 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
443 goto fail;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
444 }
1522
68620a6be643 fix support for avis with sample_size > packet size
michael
parents: 1489
diff changeset
445 ast->frame_offset= ast->cum_len;
703
81107e92a7a5 cleanup strh parser
michael
parents: 701
diff changeset
446 url_fskip(pb, size - 12 * 4);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
447 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
448 case MKTAG('s', 't', 'r', 'f'):
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
449 /* stream header */
1785
2376ab11ea73 support yet another broken avi (filedoesitbetter.avi) which has a wrong stream count
michael
parents: 1761
diff changeset
450 if (stream_index >= (unsigned)s->nb_streams || avi->dv_demux) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
451 url_fskip(pb, size);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
452 } else {
5087
5de39afaca2e Check size of "strf" header against size of enclosing "LIST" if there is one.
reimar
parents: 5058
diff changeset
453 uint64_t cur_pos = url_ftell(pb);
5de39afaca2e Check size of "strf" header against size of enclosing "LIST" if there is one.
reimar
parents: 5058
diff changeset
454 if (cur_pos < list_end)
5de39afaca2e Check size of "strf" header against size of enclosing "LIST" if there is one.
reimar
parents: 5058
diff changeset
455 size = FFMIN(size, list_end - cur_pos);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
456 st = s->streams[stream_index];
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
457 switch(codec_type) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
458 case CODEC_TYPE_VIDEO:
2584
4630871ef965 Add support for AMV variants of AVI files.
diego
parents: 2579
diff changeset
459 if(amv_file_format){
4630871ef965 Add support for AMV variants of AVI files.
diego
parents: 2579
diff changeset
460 st->codec->width=avih_width;
4630871ef965 Add support for AMV variants of AVI files.
diego
parents: 2579
diff changeset
461 st->codec->height=avih_height;
4630871ef965 Add support for AMV variants of AVI files.
diego
parents: 2579
diff changeset
462 st->codec->codec_type = CODEC_TYPE_VIDEO;
4630871ef965 Add support for AMV variants of AVI files.
diego
parents: 2579
diff changeset
463 st->codec->codec_id = CODEC_ID_AMV;
4630871ef965 Add support for AMV variants of AVI files.
diego
parents: 2579
diff changeset
464 url_fskip(pb, size);
4630871ef965 Add support for AMV variants of AVI files.
diego
parents: 2579
diff changeset
465 break;
4630871ef965 Add support for AMV variants of AVI files.
diego
parents: 2579
diff changeset
466 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
467 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
468 st->codec->width = get_le32(pb);
4550
a36f9f2eefcb Fix raw rgb/bgr vertical flip in avi based on info from http://www.fourcc.org/fccbihgt.php.
michael
parents: 4541
diff changeset
469 st->codec->height = (int32_t)get_le32(pb);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
470 get_le16(pb); /* panes */
3908
1d3d17de20ba Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents: 3759
diff changeset
471 st->codec->bits_per_coded_sample= get_le16(pb); /* depth */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
472 tag1 = get_le32(pb);
75
78bec272ce3a read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents: 73
diff changeset
473 get_le32(pb); /* ImageSize */
78bec272ce3a read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents: 73
diff changeset
474 get_le32(pb); /* XPelsPerMeter */
78bec272ce3a read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents: 73
diff changeset
475 get_le32(pb); /* YPelsPerMeter */
78bec272ce3a read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents: 73
diff changeset
476 get_le32(pb); /* ClrUsed */
78bec272ce3a read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents: 73
diff changeset
477 get_le32(pb); /* ClrImportant */
78bec272ce3a read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents: 73
diff changeset
478
2315
f93b242dde21 Hack to support XSUB subtitles in AVI
reimar
parents: 2023
diff changeset
479 if (tag1 == MKTAG('D', 'X', 'S', 'B')) {
f93b242dde21 Hack to support XSUB subtitles in AVI
reimar
parents: 2023
diff changeset
480 st->codec->codec_type = CODEC_TYPE_SUBTITLE;
f93b242dde21 Hack to support XSUB subtitles in AVI
reimar
parents: 2023
diff changeset
481 st->codec->codec_tag = tag1;
f93b242dde21 Hack to support XSUB subtitles in AVI
reimar
parents: 2023
diff changeset
482 st->codec->codec_id = CODEC_ID_XSUB;
f93b242dde21 Hack to support XSUB subtitles in AVI
reimar
parents: 2023
diff changeset
483 break;
f93b242dde21 Hack to support XSUB subtitles in AVI
reimar
parents: 2023
diff changeset
484 }
f93b242dde21 Hack to support XSUB subtitles in AVI
reimar
parents: 2023
diff changeset
485
1441
ad3b03b7b142 reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents: 1415
diff changeset
486 if(size > 10*4 && size<(1<<30)){
ad3b03b7b142 reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents: 1415
diff changeset
487 st->codec->extradata_size= size - 10*4;
ad3b03b7b142 reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents: 1415
diff changeset
488 st->codec->extradata= av_malloc(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
5088
5da0e7ccc3c4 Check for failed extradata malloc, fixes a crash in out-of-memory conditions
reimar
parents: 5087
diff changeset
489 if (!st->codec->extradata) {
5da0e7ccc3c4 Check for failed extradata malloc, fixes a crash in out-of-memory conditions
reimar
parents: 5087
diff changeset
490 st->codec->extradata_size= 0;
5da0e7ccc3c4 Check for failed extradata malloc, fixes a crash in out-of-memory conditions
reimar
parents: 5087
diff changeset
491 return AVERROR(ENOMEM);
5da0e7ccc3c4 Check for failed extradata malloc, fixes a crash in out-of-memory conditions
reimar
parents: 5087
diff changeset
492 }
1441
ad3b03b7b142 reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents: 1415
diff changeset
493 get_buffer(pb, st->codec->extradata, st->codec->extradata_size);
ad3b03b7b142 reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
diego
parents: 1415
diff changeset
494 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
495
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
496 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
497 get_byte(pb);
75
78bec272ce3a read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents: 73
diff changeset
498
3538
e50efb387048 spelling cosmetics
diego
parents: 3487
diff changeset
499 /* Extract palette from extradata if bpp <= 8. */
e50efb387048 spelling cosmetics
diego
parents: 3487
diff changeset
500 /* This code assumes that extradata contains only palette. */
e50efb387048 spelling cosmetics
diego
parents: 3487
diff changeset
501 /* This is true for all paletted codecs implemented in FFmpeg. */
3908
1d3d17de20ba Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents: 3759
diff changeset
502 if (st->codec->extradata_size && (st->codec->bits_per_coded_sample <= 8)) {
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
503 st->codec->palctrl = av_mallocz(sizeof(AVPaletteControl));
5108
44a0fab134a9 Replace WORDS_BIGENDIAN with HAVE_BIGENDIAN
mru
parents: 5088
diff changeset
504 #if HAVE_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
505 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
506 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
507 #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
508 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
509 FFMIN(st->codec->extradata_size, AVPALETTE_SIZE));
297
85d558a18134 Make avi and asf demuxer export palette in palctrl
rtognimp
parents: 296
diff changeset
510 #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
511 st->codec->palctrl->palette_changed = 1;
297
85d558a18134 Make avi and asf demuxer export palette in palctrl
rtognimp
parents: 296
diff changeset
512 }
85d558a18134 Make avi and asf demuxer export palette in palctrl
rtognimp
parents: 296
diff changeset
513
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
514 #ifdef DEBUG
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
515 print_tag("video", tag1, 0);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
516 #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
517 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
518 st->codec->codec_tag = tag1;
5058
33a244b7ca65 Add ff_ prefixes to exported symbols in libavformat/riff.h.
diego
parents: 4957
diff changeset
519 st->codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags, tag1);
3538
e50efb387048 spelling cosmetics
diego
parents: 3487
diff changeset
520 st->need_parsing = AVSTREAM_PARSE_HEADERS; // This is needed to get the pict type which is necessary for generating correct pts.
5522
7698da6e1f0a Support uncompressed ("Resolution 1:1") Avid AVI Codec, (partially) fixes issue 1474.
cehoyos
parents: 5446
diff changeset
521 // Support "Resolution 1:1" for Avid AVI Codec
7698da6e1f0a Support uncompressed ("Resolution 1:1") Avid AVI Codec, (partially) fixes issue 1474.
cehoyos
parents: 5446
diff changeset
522 if(tag1 == MKTAG('A', 'V', 'R', 'n') &&
7698da6e1f0a Support uncompressed ("Resolution 1:1") Avid AVI Codec, (partially) fixes issue 1474.
cehoyos
parents: 5446
diff changeset
523 st->codec->extradata_size >= 31 &&
7698da6e1f0a Support uncompressed ("Resolution 1:1") Avid AVI Codec, (partially) fixes issue 1474.
cehoyos
parents: 5446
diff changeset
524 !memcmp(&st->codec->extradata[28], "1:1", 3))
7698da6e1f0a Support uncompressed ("Resolution 1:1") Avid AVI Codec, (partially) fixes issue 1474.
cehoyos
parents: 5446
diff changeset
525 st->codec->codec_id = CODEC_ID_RAWVIDEO;
4550
a36f9f2eefcb Fix raw rgb/bgr vertical flip in avi based on info from http://www.fourcc.org/fccbihgt.php.
michael
parents: 4541
diff changeset
526
a36f9f2eefcb Fix raw rgb/bgr vertical flip in avi based on info from http://www.fourcc.org/fccbihgt.php.
michael
parents: 4541
diff changeset
527 if(st->codec->codec_tag==0 && st->codec->height > 0 && st->codec->extradata_size < 1U<<30){
a36f9f2eefcb Fix raw rgb/bgr vertical flip in avi based on info from http://www.fourcc.org/fccbihgt.php.
michael
parents: 4541
diff changeset
528 st->codec->extradata_size+= 9;
a36f9f2eefcb Fix raw rgb/bgr vertical flip in avi based on info from http://www.fourcc.org/fccbihgt.php.
michael
parents: 4541
diff changeset
529 st->codec->extradata= av_realloc(st->codec->extradata, st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
a36f9f2eefcb Fix raw rgb/bgr vertical flip in avi based on info from http://www.fourcc.org/fccbihgt.php.
michael
parents: 4541
diff changeset
530 if(st->codec->extradata)
a36f9f2eefcb Fix raw rgb/bgr vertical flip in avi based on info from http://www.fourcc.org/fccbihgt.php.
michael
parents: 4541
diff changeset
531 memcpy(st->codec->extradata + st->codec->extradata_size - 9, "BottomUp", 9);
a36f9f2eefcb Fix raw rgb/bgr vertical flip in avi based on info from http://www.fourcc.org/fccbihgt.php.
michael
parents: 4541
diff changeset
532 }
a36f9f2eefcb Fix raw rgb/bgr vertical flip in avi based on info from http://www.fourcc.org/fccbihgt.php.
michael
parents: 4541
diff changeset
533 st->codec->height= FFABS(st->codec->height);
a36f9f2eefcb Fix raw rgb/bgr vertical flip in avi based on info from http://www.fourcc.org/fccbihgt.php.
michael
parents: 4541
diff changeset
534
75
78bec272ce3a read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents: 73
diff changeset
535 // url_fskip(pb, size - 5 * 4);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
536 break;
73
d40ddc73858a reversing not yet reversed changes from r1.7 -> r1.8 except the static/const stuff
michaelni
parents: 65
diff changeset
537 case CODEC_TYPE_AUDIO:
5058
33a244b7ca65 Add ff_ prefixes to exported symbols in libavformat/riff.h.
diego
parents: 4957
diff changeset
538 ff_get_wav_header(pb, st->codec, size);
3105
2b9c6bfc04a5 Use block_align as the avi spec says.
michael
parents: 3104
diff changeset
539 if(ast->sample_size && st->codec->block_align && ast->sample_size != st->codec->block_align){
3104
0f8d91124c84 Print slightly more useful info.
michael
parents: 2877
diff changeset
540 av_log(s, AV_LOG_WARNING, "sample size (%d) != block align (%d)\n", ast->sample_size, st->codec->block_align);
3105
2b9c6bfc04a5 Use block_align as the avi spec says.
michael
parents: 3104
diff changeset
541 ast->sample_size= st->codec->block_align;
2b9c6bfc04a5 Use block_align as the avi spec says.
michael
parents: 3104
diff changeset
542 }
13
8a5285a0ca2f Fix for odd strf tag in Stargate SG-1 - 3x18 - Shades of Grey.avi
mmu_man
parents: 5
diff changeset
543 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
544 url_fskip(pb, 1);
1527
185cafb49ae8 Fix misplaced comment.
diego
parents: 1526
diff changeset
545 /* Force parsing as several audio frames can be in
3538
e50efb387048 spelling cosmetics
diego
parents: 3487
diff changeset
546 * one packet and timestamps refer to packet start. */
2020
d0d39f124c6b timestamps generation improvement when parsing avi
benoit
parents: 2001
diff changeset
547 st->need_parsing = AVSTREAM_PARSE_TIMESTAMPS;
3538
e50efb387048 spelling cosmetics
diego
parents: 3487
diff changeset
548 /* ADTS header is in extradata, AAC without header must be
e50efb387048 spelling cosmetics
diego
parents: 3487
diff changeset
549 * stored as exact frames. Parser not needed and it will
e50efb387048 spelling cosmetics
diego
parents: 3487
diff changeset
550 * fail. */
1472
49d5a5ca2987 get rid of CODEC_ID_MPEG4AAC after next version bump, and change it to CODEC_ID_AAC where used
bcoudurier
parents: 1443
diff changeset
551 if (st->codec->codec_id == CODEC_ID_AAC && st->codec->extradata_size)
2023
a3e79d6e4e3c add an enum for need_parsing
aurel
parents: 2020
diff changeset
552 st->need_parsing = AVSTREAM_PARSE_NONE;
1526
135565ec768d Clean up XAN DPCM hack and set codec_tag to 0 for XAN DPCM, AVI files
diego
parents: 1522
diff changeset
553 /* AVI files with Xan DPCM audio (wrongly) declare PCM
135565ec768d Clean up XAN DPCM hack and set codec_tag to 0 for XAN DPCM, AVI files
diego
parents: 1522
diff changeset
554 * audio in the header but have Axan as stream_code_tag. */
4243
964903243e66 remove ff_get_fourcc() and use AV_RL32() instead
aurel
parents: 4230
diff changeset
555 if (st->codec->stream_codec_tag == AV_RL32("Axan")){
1526
135565ec768d Clean up XAN DPCM hack and set codec_tag to 0 for XAN DPCM, AVI files
diego
parents: 1522
diff changeset
556 st->codec->codec_id = CODEC_ID_XAN_DPCM;
135565ec768d Clean up XAN DPCM hack and set codec_tag to 0 for XAN DPCM, AVI files
diego
parents: 1522
diff changeset
557 st->codec->codec_tag = 0;
135565ec768d Clean up XAN DPCM hack and set codec_tag to 0 for XAN DPCM, AVI files
diego
parents: 1522
diff changeset
558 }
2584
4630871ef965 Add support for AMV variants of AVI files.
diego
parents: 2579
diff changeset
559 if (amv_file_format)
4630871ef965 Add support for AMV variants of AVI files.
diego
parents: 2579
diff changeset
560 st->codec->codec_id = CODEC_ID_ADPCM_IMA_AMV;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
561 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
562 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
563 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
564 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
565 st->codec->codec_tag= 0;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
566 url_fskip(pb, size);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
567 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
568 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
569 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
570 break;
977
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
571 case MKTAG('i', 'n', 'd', 'x'):
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
572 i= url_ftell(pb);
1294
12398b868e18 ignore index parameter to ignore the ODML index in avi
michael
parents: 1286
diff changeset
573 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
574 read_braindead_odml_indx(s, 0);
8aa77d05572e dont load the index if we cant seek back
michael
parents: 1051
diff changeset
575 }
977
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
576 url_fseek(pb, i+size, SEEK_SET);
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
577 break;
2877
f0665d1388ad Extract aspect ratio from ODML/vprp.
michael
parents: 2771
diff changeset
578 case MKTAG('v', 'p', 'r', 'p'):
f0665d1388ad Extract aspect ratio from ODML/vprp.
michael
parents: 2771
diff changeset
579 if(stream_index < (unsigned)s->nb_streams && size > 9*4){
f0665d1388ad Extract aspect ratio from ODML/vprp.
michael
parents: 2771
diff changeset
580 AVRational active, active_aspect;
f0665d1388ad Extract aspect ratio from ODML/vprp.
michael
parents: 2771
diff changeset
581
f0665d1388ad Extract aspect ratio from ODML/vprp.
michael
parents: 2771
diff changeset
582 st = s->streams[stream_index];
f0665d1388ad Extract aspect ratio from ODML/vprp.
michael
parents: 2771
diff changeset
583 get_le32(pb);
f0665d1388ad Extract aspect ratio from ODML/vprp.
michael
parents: 2771
diff changeset
584 get_le32(pb);
f0665d1388ad Extract aspect ratio from ODML/vprp.
michael
parents: 2771
diff changeset
585 get_le32(pb);
f0665d1388ad Extract aspect ratio from ODML/vprp.
michael
parents: 2771
diff changeset
586 get_le32(pb);
f0665d1388ad Extract aspect ratio from ODML/vprp.
michael
parents: 2771
diff changeset
587 get_le32(pb);
f0665d1388ad Extract aspect ratio from ODML/vprp.
michael
parents: 2771
diff changeset
588
3177
f5ee8f2afc83 Fix aspect ratio.
michael
parents: 3157
diff changeset
589 active_aspect.den= get_le16(pb);
2877
f0665d1388ad Extract aspect ratio from ODML/vprp.
michael
parents: 2771
diff changeset
590 active_aspect.num= get_le16(pb);
f0665d1388ad Extract aspect ratio from ODML/vprp.
michael
parents: 2771
diff changeset
591 active.num = get_le32(pb);
f0665d1388ad Extract aspect ratio from ODML/vprp.
michael
parents: 2771
diff changeset
592 active.den = get_le32(pb);
f0665d1388ad Extract aspect ratio from ODML/vprp.
michael
parents: 2771
diff changeset
593 get_le32(pb); //nbFieldsPerFrame
f0665d1388ad Extract aspect ratio from ODML/vprp.
michael
parents: 2771
diff changeset
594
f0665d1388ad Extract aspect ratio from ODML/vprp.
michael
parents: 2771
diff changeset
595 if(active_aspect.num && active_aspect.den && active.num && active.den){
3759
27537074f2a9 convert every muxer/demuxer to write/read sample_aspect_ratio from/to
aurel
parents: 3610
diff changeset
596 st->sample_aspect_ratio= av_div_q(active_aspect, active);
2877
f0665d1388ad Extract aspect ratio from ODML/vprp.
michael
parents: 2771
diff changeset
597 //av_log(s, AV_LOG_ERROR, "vprp %d/%d %d/%d\n", active_aspect.num, active_aspect.den, active.num, active.den);
f0665d1388ad Extract aspect ratio from ODML/vprp.
michael
parents: 2771
diff changeset
598 }
f0665d1388ad Extract aspect ratio from ODML/vprp.
michael
parents: 2771
diff changeset
599 size -= 9*4;
f0665d1388ad Extract aspect ratio from ODML/vprp.
michael
parents: 2771
diff changeset
600 }
f0665d1388ad Extract aspect ratio from ODML/vprp.
michael
parents: 2771
diff changeset
601 url_fseek(pb, size, SEEK_CUR);
f0665d1388ad Extract aspect ratio from ODML/vprp.
michael
parents: 2771
diff changeset
602 break;
1256
2cddf00f92a6 AVI tag reading and writing patch by David Conrad.
banan
parents: 1172
diff changeset
603 case MKTAG('I', 'N', 'A', 'M'):
4149
1f857a4519bd Generic metadata API.
michael
parents: 4117
diff changeset
604 avi_read_tag(s, "Title", size);
1256
2cddf00f92a6 AVI tag reading and writing patch by David Conrad.
banan
parents: 1172
diff changeset
605 break;
2cddf00f92a6 AVI tag reading and writing patch by David Conrad.
banan
parents: 1172
diff changeset
606 case MKTAG('I', 'A', 'R', 'T'):
4149
1f857a4519bd Generic metadata API.
michael
parents: 4117
diff changeset
607 avi_read_tag(s, "Artist", size);
1256
2cddf00f92a6 AVI tag reading and writing patch by David Conrad.
banan
parents: 1172
diff changeset
608 break;
2cddf00f92a6 AVI tag reading and writing patch by David Conrad.
banan
parents: 1172
diff changeset
609 case MKTAG('I', 'C', 'O', 'P'):
4149
1f857a4519bd Generic metadata API.
michael
parents: 4117
diff changeset
610 avi_read_tag(s, "Copyright", size);
1256
2cddf00f92a6 AVI tag reading and writing patch by David Conrad.
banan
parents: 1172
diff changeset
611 break;
2cddf00f92a6 AVI tag reading and writing patch by David Conrad.
banan
parents: 1172
diff changeset
612 case MKTAG('I', 'C', 'M', 'T'):
4149
1f857a4519bd Generic metadata API.
michael
parents: 4117
diff changeset
613 avi_read_tag(s, "Comment", size);
1256
2cddf00f92a6 AVI tag reading and writing patch by David Conrad.
banan
parents: 1172
diff changeset
614 break;
2cddf00f92a6 AVI tag reading and writing patch by David Conrad.
banan
parents: 1172
diff changeset
615 case MKTAG('I', 'G', 'N', 'R'):
4149
1f857a4519bd Generic metadata API.
michael
parents: 4117
diff changeset
616 avi_read_tag(s, "Genre", size);
1256
2cddf00f92a6 AVI tag reading and writing patch by David Conrad.
banan
parents: 1172
diff changeset
617 break;
1296
654749c12a29 Better tag support:
gpoirier
parents: 1294
diff changeset
618 case MKTAG('I', 'P', 'R', 'D'):
4149
1f857a4519bd Generic metadata API.
michael
parents: 4117
diff changeset
619 avi_read_tag(s, "Album", size);
1296
654749c12a29 Better tag support:
gpoirier
parents: 1294
diff changeset
620 break;
1298
29fba975df47 Allow to get the the track number in the IPRT (part) tag in AVI.
gpoirier
parents: 1296
diff changeset
621 case MKTAG('I', 'P', 'R', 'T'):
4149
1f857a4519bd Generic metadata API.
michael
parents: 4117
diff changeset
622 avi_read_tag(s, "Track", size);
1298
29fba975df47 Allow to get the the track number in the IPRT (part) tag in AVI.
gpoirier
parents: 1296
diff changeset
623 break;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
624 default:
1894
1cbd1d658165 fix demuxing of broken MVI_3011.avi
michael
parents: 1785
diff changeset
625 if(size > 1000000){
3538
e50efb387048 spelling cosmetics
diego
parents: 3487
diff changeset
626 av_log(s, AV_LOG_ERROR, "Something went wrong during header parsing, "
e50efb387048 spelling cosmetics
diego
parents: 3487
diff changeset
627 "I will ignore it and try to continue anyway.\n");
1894
1cbd1d658165 fix demuxing of broken MVI_3011.avi
michael
parents: 1785
diff changeset
628 avi->movi_list = url_ftell(pb) - 4;
1cbd1d658165 fix demuxing of broken MVI_3011.avi
michael
parents: 1785
diff changeset
629 avi->movi_end = url_fsize(pb);
1cbd1d658165 fix demuxing of broken MVI_3011.avi
michael
parents: 1785
diff changeset
630 goto end_of_header;
1cbd1d658165 fix demuxing of broken MVI_3011.avi
michael
parents: 1785
diff changeset
631 }
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
632 /* skip tag */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
633 size += (size & 1);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
634 url_fskip(pb, size);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
635 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
636 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
637 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
638 end_of_header:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
639 /* check stream number */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
640 if (stream_index != s->nb_streams - 1) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
641 fail:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
642 return -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
643 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
644
1115
8aa77d05572e dont load the index if we cant seek back
michael
parents: 1051
diff changeset
645 if(!avi->index_loaded && !url_is_streamed(pb))
977
8bb9cea3c2d3 ODML index parsing support
michael
parents: 896
diff changeset
646 avi_load_index(s);
469
6a4cc19e8d9b exporting keyframe flags, fixes keyframe stuff with streamcopy
michael
parents: 466
diff changeset
647 avi->index_loaded = 1;
979
d2e5dfdf4def add size to AVIndex
michael
parents: 977
diff changeset
648 avi->non_interleaved |= guess_ni_flag(s);
3383
2e9f19e0493b Tell the user if a AVI is non interleaved.
michael
parents: 3365
diff changeset
649 if(avi->non_interleaved) {
3538
e50efb387048 spelling cosmetics
diego
parents: 3487
diff changeset
650 av_log(s, AV_LOG_INFO, "non-interleaved AVI\n");
983
558381bf97d2 support seeking in RenderAvi.avi (audio stream == single huge chunk)
michael
parents: 982
diff changeset
651 clean_index(s);
3383
2e9f19e0493b Tell the user if a AVI is non interleaved.
michael
parents: 3365
diff changeset
652 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
653
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
654 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
655 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
656
3983
38269a4cfe68 Factorize stream id parsing.
michael
parents: 3973
diff changeset
657 static int get_stream_idx(int *d){
38269a4cfe68 Factorize stream id parsing.
michael
parents: 3973
diff changeset
658 if( d[0] >= '0' && d[0] <= '9'
38269a4cfe68 Factorize stream id parsing.
michael
parents: 3973
diff changeset
659 && d[1] >= '0' && d[1] <= '9'){
38269a4cfe68 Factorize stream id parsing.
michael
parents: 3973
diff changeset
660 return (d[0] - '0') * 10 + (d[1] - '0');
38269a4cfe68 Factorize stream id parsing.
michael
parents: 3973
diff changeset
661 }else{
38269a4cfe68 Factorize stream id parsing.
michael
parents: 3973
diff changeset
662 return 100; //invalid stream ID
38269a4cfe68 Factorize stream id parsing.
michael
parents: 3973
diff changeset
663 }
38269a4cfe68 Factorize stream id parsing.
michael
parents: 3973
diff changeset
664 }
38269a4cfe68 Factorize stream id parsing.
michael
parents: 3973
diff changeset
665
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
666 static int avi_read_packet(AVFormatContext *s, AVPacket *pkt)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
667 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
668 AVIContext *avi = s->priv_data;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2584
diff changeset
669 ByteIOContext *pb = s->pb;
4552
da2be12b7b4b Handle chunks with the MSB in size set correctly that is unsigned.
michael
parents: 4550
diff changeset
670 int n, d[8];
da2be12b7b4b Handle chunks with the MSB in size set correctly that is unsigned.
michael
parents: 4550
diff changeset
671 unsigned int size;
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3908
diff changeset
672 int64_t i, sync;
262
f174d9c00bce * DV handling was streamlined for both muxing/demuxing and
romansh
parents: 227
diff changeset
673 void* dstr;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
674
4210
ec95366371ba replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
aurel
parents: 4203
diff changeset
675 if (CONFIG_DV_DEMUXER && avi->dv_demux) {
4552
da2be12b7b4b Handle chunks with the MSB in size set correctly that is unsigned.
michael
parents: 4550
diff changeset
676 int size = dv_get_packet(avi->dv_demux, pkt);
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
677 if (size >= 0)
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
678 return size;
149
f4de8f9c39bd use custom packet allocation only for DV
bellard
parents: 119
diff changeset
679 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
680
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
681 if(avi->non_interleaved){
851
62e66722e9bb Kill some compiler warnings. Compiled code verified identical after changes.
mru
parents: 842
diff changeset
682 int best_stream_index = 0;
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
683 AVStream *best_st= NULL;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
684 AVIStream *best_ast;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
685 int64_t best_ts= INT64_MAX;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
686 int i;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
687
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
688 for(i=0; i<s->nb_streams; i++){
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
689 AVStream *st = s->streams[i];
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
690 AVIStream *ast = st->priv_data;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
691 int64_t ts= ast->frame_offset;
5167
00fcfe0596e8 Fix a bug with reading non-interleaved AVI if one the streams is
cehoyos
parents: 5166
diff changeset
692 int64_t last_ts;
569
aca10aa7686f fixing demuxing of vc2_intro.avi
michael
parents: 562
diff changeset
693
5166
1258b5879021 Factorise st->nb_index_entries check.
cehoyos
parents: 5149
diff changeset
694 if(!st->nb_index_entries)
1258b5879021 Factorise st->nb_index_entries check.
cehoyos
parents: 5149
diff changeset
695 continue;
1258b5879021 Factorise st->nb_index_entries check.
cehoyos
parents: 5149
diff changeset
696
5167
00fcfe0596e8 Fix a bug with reading non-interleaved AVI if one the streams is
cehoyos
parents: 5166
diff changeset
697 last_ts = st->index_entries[st->nb_index_entries - 1].timestamp;
00fcfe0596e8 Fix a bug with reading non-interleaved AVI if one the streams is
cehoyos
parents: 5166
diff changeset
698 if(!ast->remaining && ts > last_ts)
00fcfe0596e8 Fix a bug with reading non-interleaved AVI if one the streams is
cehoyos
parents: 5166
diff changeset
699 continue;
00fcfe0596e8 Fix a bug with reading non-interleaved AVI if one the streams is
cehoyos
parents: 5166
diff changeset
700
5326
4e1e9ab777a1 Support non interleaved avi files that have 0<size<sample_size.
michael
parents: 5243
diff changeset
701 ts = av_rescale_q(ts, st->time_base, (AVRational){FFMAX(1, ast->sample_size), AV_TIME_BASE});
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
702
4515
1d9ace1dec78 Add a context to av_log() calls and modify a function prototype to allow it.
benoit
parents: 4353
diff changeset
703 // av_log(s, AV_LOG_DEBUG, "%"PRId64" %d/%d %"PRId64"\n", ts, st->time_base.num, st->time_base.den, ast->frame_offset);
5166
1258b5879021 Factorise st->nb_index_entries check.
cehoyos
parents: 5149
diff changeset
704 if(ts < best_ts){
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
705 best_ts= ts;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
706 best_st= st;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
707 best_stream_index= i;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
708 }
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
709 }
3384
b1d2c80f2ded Fixes NULL pointer dereference CID66
michael
parents: 3383
diff changeset
710 if(!best_st)
b1d2c80f2ded Fixes NULL pointer dereference CID66
michael
parents: 3383
diff changeset
711 return -1;
b1d2c80f2ded Fixes NULL pointer dereference CID66
michael
parents: 3383
diff changeset
712
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
713 best_ast = best_st->priv_data;
5326
4e1e9ab777a1 Support non interleaved avi files that have 0<size<sample_size.
michael
parents: 5243
diff changeset
714 best_ts = av_rescale_q(best_ts, (AVRational){FFMAX(1, best_ast->sample_size), AV_TIME_BASE}, best_st->time_base);
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
715 if(best_ast->remaining)
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
716 i= av_index_search_timestamp(best_st, best_ts, AVSEEK_FLAG_ANY | AVSEEK_FLAG_BACKWARD);
4104
b55158db61fa Fix non interleaved variable fps ODML avis.
michael
parents: 3984
diff changeset
717 else{
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
718 i= av_index_search_timestamp(best_st, best_ts, AVSEEK_FLAG_ANY);
4104
b55158db61fa Fix non interleaved variable fps ODML avis.
michael
parents: 3984
diff changeset
719 if(i>=0)
5326
4e1e9ab777a1 Support non interleaved avi files that have 0<size<sample_size.
michael
parents: 5243
diff changeset
720 best_ast->frame_offset= best_st->index_entries[i].timestamp;
4104
b55158db61fa Fix non interleaved variable fps ODML avis.
michael
parents: 3984
diff changeset
721 }
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
722
4515
1d9ace1dec78 Add a context to av_log() calls and modify a function prototype to allow it.
benoit
parents: 4353
diff changeset
723 // av_log(s, AV_LOG_DEBUG, "%d\n", i);
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
724 if(i>=0){
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
725 int64_t pos= best_st->index_entries[i].pos;
980
da4296d3bc39 add movi_list offset into index
michael
parents: 979
diff changeset
726 pos += best_ast->packet_size - best_ast->remaining;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2584
diff changeset
727 url_fseek(s->pb, pos + 8, SEEK_SET);
4515
1d9ace1dec78 Add a context to av_log() calls and modify a function prototype to allow it.
benoit
parents: 4353
diff changeset
728 // av_log(s, AV_LOG_DEBUG, "pos=%"PRId64"\n", pos);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
729
982
c21f07d85158 10l forgot to set packet_size
michael
parents: 981
diff changeset
730 assert(best_ast->remaining <= best_ast->packet_size);
c21f07d85158 10l forgot to set packet_size
michael
parents: 981
diff changeset
731
981
55519fa957c3 fix demuxing of XviD_with_3_AAC-HE_audio_streams.avi
michael
parents: 980
diff changeset
732 avi->stream_index= best_stream_index;
55519fa957c3 fix demuxing of XviD_with_3_AAC-HE_audio_streams.avi
michael
parents: 980
diff changeset
733 if(!best_ast->remaining)
982
c21f07d85158 10l forgot to set packet_size
michael
parents: 981
diff changeset
734 best_ast->packet_size=
981
55519fa957c3 fix demuxing of XviD_with_3_AAC-HE_audio_streams.avi
michael
parents: 980
diff changeset
735 best_ast->remaining= best_st->index_entries[i].size;
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
736 }
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
737 }
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
738
569
aca10aa7686f fixing demuxing of vc2_intro.avi
michael
parents: 562
diff changeset
739 resync:
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
740 if(avi->stream_index >= 0){
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
741 AVStream *st= s->streams[ avi->stream_index ];
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
742 AVIStream *ast= st->priv_data;
4555
fd360a55f56d Check for alloc failures.
michael
parents: 4554
diff changeset
743 int size, err;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
744
988
fb8b2bb9f716 fixing demuxing of minorityreport.AVI
michael
parents: 984
diff changeset
745 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
746 size= INT_MAX;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
747 else if(ast->sample_size < 32)
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
748 size= 64*ast->sample_size;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
749 else
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
750 size= ast->sample_size;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
751
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
752 if(size > ast->remaining)
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
753 size= ast->remaining;
3984
46fc6e792241 Favor even chunk sizes in ambiguous cases.
michael
parents: 3983
diff changeset
754 avi->last_pkt_pos= url_ftell(pb);
4555
fd360a55f56d Check for alloc failures.
michael
parents: 4554
diff changeset
755 err= av_get_packet(pb, pkt, size);
fd360a55f56d Check for alloc failures.
michael
parents: 4554
diff changeset
756 if(err<0)
fd360a55f56d Check for alloc failures.
michael
parents: 4554
diff changeset
757 return err;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
758
3157
27c5bc69a1f9 One non functional AVPalette chunk less, one heap overflow less.
michael
parents: 3105
diff changeset
759 if(ast->has_pal && pkt->data && pkt->size<(unsigned)INT_MAX/2){
4555
fd360a55f56d Check for alloc failures.
michael
parents: 4554
diff changeset
760 void *ptr= av_realloc(pkt->data, pkt->size + 4*256 + FF_INPUT_BUFFER_PADDING_SIZE);
fd360a55f56d Check for alloc failures.
michael
parents: 4554
diff changeset
761 if(ptr){
3157
27c5bc69a1f9 One non functional AVPalette chunk less, one heap overflow less.
michael
parents: 3105
diff changeset
762 ast->has_pal=0;
27c5bc69a1f9 One non functional AVPalette chunk less, one heap overflow less.
michael
parents: 3105
diff changeset
763 pkt->size += 4*256;
4555
fd360a55f56d Check for alloc failures.
michael
parents: 4554
diff changeset
764 pkt->data= ptr;
3157
27c5bc69a1f9 One non functional AVPalette chunk less, one heap overflow less.
michael
parents: 3105
diff changeset
765 memcpy(pkt->data + pkt->size - 4*256, ast->pal, 4*256);
4555
fd360a55f56d Check for alloc failures.
michael
parents: 4554
diff changeset
766 }else
fd360a55f56d Check for alloc failures.
michael
parents: 4554
diff changeset
767 av_log(s, AV_LOG_ERROR, "Failed to append palette\n");
3157
27c5bc69a1f9 One non functional AVPalette chunk less, one heap overflow less.
michael
parents: 3105
diff changeset
768 }
27c5bc69a1f9 One non functional AVPalette chunk less, one heap overflow less.
michael
parents: 3105
diff changeset
769
4210
ec95366371ba replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
aurel
parents: 4203
diff changeset
770 if (CONFIG_DV_DEMUXER && avi->dv_demux) {
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
771 dstr = pkt->destruct;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
772 size = dv_produce_packet(avi->dv_demux, pkt,
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
773 pkt->data, pkt->size);
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
774 pkt->destruct = dstr;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
775 pkt->flags |= PKT_FLAG_KEY;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
776 } else {
3538
e50efb387048 spelling cosmetics
diego
parents: 3487
diff changeset
777 /* XXX: How to handle B-frames in AVI? */
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
778 pkt->dts = ast->frame_offset;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
779 // pkt->dts += ast->start;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
780 if(ast->sample_size)
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
781 pkt->dts /= ast->sample_size;
4515
1d9ace1dec78 Add a context to av_log() calls and modify a function prototype to allow it.
benoit
parents: 4353
diff changeset
782 //av_log(s, AV_LOG_DEBUG, "dts:%"PRId64" offset:%"PRId64" %d/%d smpl_siz:%d base:%d st:%d size:%d\n", pkt->dts, ast->frame_offset, ast->scale, ast->rate, ast->sample_size, AV_TIME_BASE, avi->stream_index, size);
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
783 pkt->stream_index = avi->stream_index;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
784
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 775
diff changeset
785 if (st->codec->codec_type == CODEC_TYPE_VIDEO) {
1758
michael
parents: 1757
diff changeset
786 AVIndexEntry *e;
michael
parents: 1757
diff changeset
787 int index;
1757
9d217a18aa49 dynamic index building so forward and backward seeking in avi without an index is possible
michael
parents: 1721
diff changeset
788 assert(st->index_entries);
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
789
5326
4e1e9ab777a1 Support non interleaved avi files that have 0<size<sample_size.
michael
parents: 5243
diff changeset
790 index= av_index_search_timestamp(st, ast->frame_offset, 0);
1758
michael
parents: 1757
diff changeset
791 e= &st->index_entries[index];
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
792
1758
michael
parents: 1757
diff changeset
793 if(index >= 0 && e->timestamp == ast->frame_offset){
michael
parents: 1757
diff changeset
794 if (e->flags & AVINDEX_KEYFRAME)
michael
parents: 1757
diff changeset
795 pkt->flags |= PKT_FLAG_KEY;
michael
parents: 1757
diff changeset
796 }
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
797 } else {
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
798 pkt->flags |= PKT_FLAG_KEY;
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
799 }
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
800 if(ast->sample_size)
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
801 ast->frame_offset += pkt->size;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
802 else
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
803 ast->frame_offset++;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
804 }
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
805 ast->remaining -= size;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
806 if(!ast->remaining){
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
807 avi->stream_index= -1;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
808 ast->packet_size= 0;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
809 }
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
810
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
811 return size;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
812 }
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
813
569
aca10aa7686f fixing demuxing of vc2_intro.avi
michael
parents: 562
diff changeset
814 memset(d, -1, sizeof(int)*8);
aca10aa7686f fixing demuxing of vc2_intro.avi
michael
parents: 562
diff changeset
815 for(i=sync=url_ftell(pb); !url_feof(pb); i++) {
82
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
816 int j;
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
817
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
818 for(j=0; j<7; j++)
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
819 d[j]= d[j+1];
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
820 d[7]= get_byte(pb);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
821
82
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
822 size= d[4] + (d[5]<<8) + (d[6]<<16) + (d[7]<<24);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
823
3983
38269a4cfe68 Factorize stream id parsing.
michael
parents: 3973
diff changeset
824 n= get_stream_idx(d+2);
4515
1d9ace1dec78 Add a context to av_log() calls and modify a function prototype to allow it.
benoit
parents: 4353
diff changeset
825 //av_log(s, AV_LOG_DEBUG, "%X %X %X %X %X %X %X %X %"PRId64" %d %d\n", d[0], d[1], d[2], d[3], d[4], d[5], d[6], d[7], i, size, n);
4552
da2be12b7b4b Handle chunks with the MSB in size set correctly that is unsigned.
michael
parents: 4550
diff changeset
826 if(i + (uint64_t)size > avi->fsize || d[0]<0)
519
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
827 continue;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
828
82
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
829 //parse ix##
519
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
830 if( (d[0] == 'i' && d[1] == 'x' && n < s->nb_streams)
887
d70e50f1495f COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 885
diff changeset
831 //parse JUNK
2384
2b7be8fd6390 remove broken movi_end skip-hack-check
michael
parents: 2383
diff changeset
832 ||(d[0] == 'J' && d[1] == 'U' && d[2] == 'N' && d[3] == 'K')
2b7be8fd6390 remove broken movi_end skip-hack-check
michael
parents: 2383
diff changeset
833 ||(d[0] == 'i' && d[1] == 'd' && d[2] == 'x' && d[3] == '1')){
82
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
834 url_fskip(pb, size);
4515
1d9ace1dec78 Add a context to av_log() calls and modify a function prototype to allow it.
benoit
parents: 4353
diff changeset
835 //av_log(s, AV_LOG_DEBUG, "SKIP\n");
569
aca10aa7686f fixing demuxing of vc2_intro.avi
michael
parents: 562
diff changeset
836 goto resync;
82
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
837 }
510
133287132e1d * simplifying OpenDML AVI handling.
romansh
parents: 495
diff changeset
838
5243
13dd683f3ff2 Fix playback of strange AVI files with stray LIST.
aurel
parents: 5167
diff changeset
839 //parse stray LIST
13dd683f3ff2 Fix playback of strange AVI files with stray LIST.
aurel
parents: 5167
diff changeset
840 if(d[0] == 'L' && d[1] == 'I' && d[2] == 'S' && d[3] == 'T'){
13dd683f3ff2 Fix playback of strange AVI files with stray LIST.
aurel
parents: 5167
diff changeset
841 url_fskip(pb, 4);
13dd683f3ff2 Fix playback of strange AVI files with stray LIST.
aurel
parents: 5167
diff changeset
842 goto resync;
13dd683f3ff2 Fix playback of strange AVI files with stray LIST.
aurel
parents: 5167
diff changeset
843 }
13dd683f3ff2 Fix playback of strange AVI files with stray LIST.
aurel
parents: 5167
diff changeset
844
3983
38269a4cfe68 Factorize stream id parsing.
michael
parents: 3973
diff changeset
845 n= get_stream_idx(d);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
846
3984
46fc6e792241 Favor even chunk sizes in ambiguous cases.
michael
parents: 3983
diff changeset
847 if(!((i-avi->last_pkt_pos)&1) && get_stream_idx(d+1) < s->nb_streams)
46fc6e792241 Favor even chunk sizes in ambiguous cases.
michael
parents: 3983
diff changeset
848 continue;
46fc6e792241 Favor even chunk sizes in ambiguous cases.
michael
parents: 3983
diff changeset
849
5146
b0706c2efb78 Do not read index chunks as audio/video data; closes issue 1336.
diego
parents: 5131
diff changeset
850 //detect ##ix chunk and skip
b0706c2efb78 Do not read index chunks as audio/video data; closes issue 1336.
diego
parents: 5131
diff changeset
851 if(d[2] == 'i' && d[3] == 'x' && n < s->nb_streams){
b0706c2efb78 Do not read index chunks as audio/video data; closes issue 1336.
diego
parents: 5131
diff changeset
852 url_fskip(pb, size);
b0706c2efb78 Do not read index chunks as audio/video data; closes issue 1336.
diego
parents: 5131
diff changeset
853 goto resync;
b0706c2efb78 Do not read index chunks as audio/video data; closes issue 1336.
diego
parents: 5131
diff changeset
854 }
b0706c2efb78 Do not read index chunks as audio/video data; closes issue 1336.
diego
parents: 5131
diff changeset
855
82
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
856 //parse ##dc/##wb
705
594a9b0cacf5 reverse zero packet dissapearence "feature"
michael
parents: 703
diff changeset
857 if(n < s->nb_streams){
3185
michael
parents: 3184
diff changeset
858 AVStream *st;
michael
parents: 3184
diff changeset
859 AVIStream *ast;
michael
parents: 3184
diff changeset
860 st = s->streams[n];
michael
parents: 3184
diff changeset
861 ast = st->priv_data;
3183
4ebe80ca2a2d Support wb00+dc00 chunk mix.
michael
parents: 3177
diff changeset
862
3184
de03f6b32914 1000l to myself, dereferencing uninitalized pointer.
michael
parents: 3183
diff changeset
863 if(s->nb_streams>=2){
de03f6b32914 1000l to myself, dereferencing uninitalized pointer.
michael
parents: 3183
diff changeset
864 AVStream *st1 = s->streams[1];
de03f6b32914 1000l to myself, dereferencing uninitalized pointer.
michael
parents: 3183
diff changeset
865 AVIStream *ast1= st1->priv_data;
3185
michael
parents: 3184
diff changeset
866 //workaround for broken small-file-bug402.avi
michael
parents: 3184
diff changeset
867 if( d[2] == 'w' && d[3] == 'b'
michael
parents: 3184
diff changeset
868 && n==0
michael
parents: 3184
diff changeset
869 && st ->codec->codec_type == CODEC_TYPE_VIDEO
michael
parents: 3184
diff changeset
870 && st1->codec->codec_type == CODEC_TYPE_AUDIO
michael
parents: 3184
diff changeset
871 && ast->prefix == 'd'*256+'c'
michael
parents: 3184
diff changeset
872 && (d[2]*256+d[3] == ast1->prefix || !ast1->prefix_count)
michael
parents: 3184
diff changeset
873 ){
michael
parents: 3184
diff changeset
874 n=1;
michael
parents: 3184
diff changeset
875 st = st1;
michael
parents: 3184
diff changeset
876 ast = ast1;
3538
e50efb387048 spelling cosmetics
diego
parents: 3487
diff changeset
877 av_log(s, AV_LOG_WARNING, "Invalid stream + prefix combination, assuming audio.\n");
3185
michael
parents: 3184
diff changeset
878 }
3184
de03f6b32914 1000l to myself, dereferencing uninitalized pointer.
michael
parents: 3183
diff changeset
879 }
3183
4ebe80ca2a2d Support wb00+dc00 chunk mix.
michael
parents: 3177
diff changeset
880
4ebe80ca2a2d Support wb00+dc00 chunk mix.
michael
parents: 3177
diff changeset
881
3185
michael
parents: 3184
diff changeset
882 if( (st->discard >= AVDISCARD_DEFAULT && size==0)
michael
parents: 3184
diff changeset
883 /*|| (st->discard >= AVDISCARD_NONKEY && !(pkt->flags & PKT_FLAG_KEY))*/ //FIXME needs a little reordering
michael
parents: 3184
diff changeset
884 || st->discard >= AVDISCARD_ALL){
708
d79164865a7c more fine grained discarding of packets
michael
parents: 705
diff changeset
885 if(ast->sample_size) ast->frame_offset += pkt->size;
d79164865a7c more fine grained discarding of packets
michael
parents: 705
diff changeset
886 else ast->frame_offset++;
650
c129846f7f02 support discarding of uninterresting packets
michael
parents: 649
diff changeset
887 url_fskip(pb, size);
c129846f7f02 support discarding of uninterresting packets
michael
parents: 649
diff changeset
888 goto resync;
3185
michael
parents: 3184
diff changeset
889 }
519
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
890
3185
michael
parents: 3184
diff changeset
891 if (d[2] == 'p' && d[3] == 'c' && size<=4*256+4) {
3157
27c5bc69a1f9 One non functional AVPalette chunk less, one heap overflow less.
michael
parents: 3105
diff changeset
892 int k = get_byte(pb);
27c5bc69a1f9 One non functional AVPalette chunk less, one heap overflow less.
michael
parents: 3105
diff changeset
893 int last = (k + get_byte(pb) - 1) & 0xFF;
27c5bc69a1f9 One non functional AVPalette chunk less, one heap overflow less.
michael
parents: 3105
diff changeset
894
27c5bc69a1f9 One non functional AVPalette chunk less, one heap overflow less.
michael
parents: 3105
diff changeset
895 get_le16(pb); //flags
27c5bc69a1f9 One non functional AVPalette chunk less, one heap overflow less.
michael
parents: 3105
diff changeset
896
27c5bc69a1f9 One non functional AVPalette chunk less, one heap overflow less.
michael
parents: 3105
diff changeset
897 for (; k <= last; k++)
27c5bc69a1f9 One non functional AVPalette chunk less, one heap overflow less.
michael
parents: 3105
diff changeset
898 ast->pal[k] = get_be32(pb)>>8;// b + (g << 8) + (r << 16);
27c5bc69a1f9 One non functional AVPalette chunk less, one heap overflow less.
michael
parents: 3105
diff changeset
899 ast->has_pal= 1;
27c5bc69a1f9 One non functional AVPalette chunk less, one heap overflow less.
michael
parents: 3105
diff changeset
900 goto resync;
3185
michael
parents: 3184
diff changeset
901 } else if( ((ast->prefix_count<5 || sync+9 > i) && d[2]<128 && d[3]<128) ||
michael
parents: 3184
diff changeset
902 d[2]*256+d[3] == ast->prefix /*||
michael
parents: 3184
diff changeset
903 (d[2] == 'd' && d[3] == 'c') ||
michael
parents: 3184
diff changeset
904 (d[2] == 'w' && d[3] == 'b')*/) {
519
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
905
4515
1d9ace1dec78 Add a context to av_log() calls and modify a function prototype to allow it.
benoit
parents: 4353
diff changeset
906 //av_log(s, AV_LOG_DEBUG, "OK\n");
3185
michael
parents: 3184
diff changeset
907 if(d[2]*256+d[3] == ast->prefix)
michael
parents: 3184
diff changeset
908 ast->prefix_count++;
michael
parents: 3184
diff changeset
909 else{
michael
parents: 3184
diff changeset
910 ast->prefix= d[2]*256+d[3];
michael
parents: 3184
diff changeset
911 ast->prefix_count= 0;
michael
parents: 3184
diff changeset
912 }
519
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
913
3185
michael
parents: 3184
diff changeset
914 avi->stream_index= n;
michael
parents: 3184
diff changeset
915 ast->packet_size= size + 8;
michael
parents: 3184
diff changeset
916 ast->remaining= size;
1757
9d217a18aa49 dynamic index building so forward and backward seeking in avi without an index is possible
michael
parents: 1721
diff changeset
917
5327
a8e26981c104 Fix infinite loop with size==0 && sample_size!=0 in non interleaved avis.
michael
parents: 5326
diff changeset
918 if(size || !ast->sample_size){
3185
michael
parents: 3184
diff changeset
919 uint64_t pos= url_ftell(pb) - 8;
michael
parents: 3184
diff changeset
920 if(!st->index_entries || !st->nb_index_entries || st->index_entries[st->nb_index_entries - 1].pos < pos){
5326
4e1e9ab777a1 Support non interleaved avi files that have 0<size<sample_size.
michael
parents: 5243
diff changeset
921 av_add_index_entry(st, pos, ast->frame_offset, size, 0, AVINDEX_KEYFRAME);
3185
michael
parents: 3184
diff changeset
922 }
1757
9d217a18aa49 dynamic index building so forward and backward seeking in avi without an index is possible
michael
parents: 1721
diff changeset
923 }
3185
michael
parents: 3184
diff changeset
924 goto resync;
1757
9d217a18aa49 dynamic index building so forward and backward seeking in avi without an index is possible
michael
parents: 1721
diff changeset
925 }
82
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
926 }
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
927 }
519
d59dc270e1f5 various fixes for the main chunk demux loop
michael
parents: 510
diff changeset
928
4541
a65e3b37f87e AVI demuxer: return AVERROR_EOF upon detection of end of file.
pross
parents: 4516
diff changeset
929 return AVERROR_EOF;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
930 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
931
3538
e50efb387048 spelling cosmetics
diego
parents: 3487
diff changeset
932 /* XXX: We make the implicit supposition that the positions are sorted
e50efb387048 spelling cosmetics
diego
parents: 3487
diff changeset
933 for each stream. */
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
934 static int avi_read_idx1(AVFormatContext *s, int size)
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
935 {
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
936 AVIContext *avi = s->priv_data;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2584
diff changeset
937 ByteIOContext *pb = s->pb;
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
938 int nb_index_entries, i;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
939 AVStream *st;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
940 AVIStream *ast;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
941 unsigned int index, tag, flags, pos, len;
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
942 unsigned last_pos= -1;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
943
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
944 nb_index_entries = size / 16;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
945 if (nb_index_entries <= 0)
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
946 return -1;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
947
3538
e50efb387048 spelling cosmetics
diego
parents: 3487
diff changeset
948 /* Read the entries and sort them in each stream component. */
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
949 for(i = 0; i < nb_index_entries; i++) {
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
950 tag = get_le32(pb);
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
951 flags = get_le32(pb);
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
952 pos = get_le32(pb);
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
953 len = get_le32(pb);
700
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
954 #if defined(DEBUG_SEEK)
4515
1d9ace1dec78 Add a context to av_log() calls and modify a function prototype to allow it.
benoit
parents: 4353
diff changeset
955 av_log(s, 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
956 i, tag, flags, pos, len);
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
957 #endif
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
958 if(i==0 && pos > avi->movi_list)
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
959 avi->movi_list= 0; //FIXME better check
980
da4296d3bc39 add movi_list offset into index
michael
parents: 979
diff changeset
960 pos += avi->movi_list;
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
961
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
962 index = ((tag & 0xff) - '0') * 10;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
963 index += ((tag >> 8) & 0xff) - '0';
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
964 if (index >= s->nb_streams)
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
965 continue;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
966 st = s->streams[index];
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
967 ast = st->priv_data;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
968
700
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
969 #if defined(DEBUG_SEEK)
4515
1d9ace1dec78 Add a context to av_log() calls and modify a function prototype to allow it.
benoit
parents: 4353
diff changeset
970 av_log(s, AV_LOG_DEBUG, "%d cum_len=%"PRId64"\n", len, ast->cum_len);
700
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
971 #endif
4554
e219c0cdcf8a Check for EOF during index reading.
michael
parents: 4552
diff changeset
972 if(url_feof(pb))
e219c0cdcf8a Check for EOF during index reading.
michael
parents: 4552
diff changeset
973 return -1;
e219c0cdcf8a Check for EOF during index reading.
michael
parents: 4552
diff changeset
974
705
594a9b0cacf5 reverse zero packet dissapearence "feature"
michael
parents: 703
diff changeset
975 if(last_pos == pos)
594a9b0cacf5 reverse zero packet dissapearence "feature"
michael
parents: 703
diff changeset
976 avi->non_interleaved= 1;
5327
a8e26981c104 Fix infinite loop with size==0 && sample_size!=0 in non interleaved avis.
michael
parents: 5326
diff changeset
977 else if(len || !ast->sample_size)
5326
4e1e9ab777a1 Support non interleaved avi files that have 0<size<sample_size.
michael
parents: 5243
diff changeset
978 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
979 if(ast->sample_size)
1522
68620a6be643 fix support for avis with sample_size > packet size
michael
parents: 1489
diff changeset
980 ast->cum_len += len;
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
981 else
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
982 ast->cum_len ++;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
983 last_pos= pos;
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
984 }
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
985 return 0;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
986 }
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
987
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
988 static int guess_ni_flag(AVFormatContext *s){
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
989 int i;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
990 int64_t last_start=0;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
991 int64_t first_end= INT64_MAX;
4957
911053932726 Workaround broken AVI files from DC-XZ6.
michael
parents: 4956
diff changeset
992 int64_t oldpos= url_ftell(s->pb);
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
993
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
994 for(i=0; i<s->nb_streams; i++){
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
995 AVStream *st = s->streams[i];
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
996 int n= st->nb_index_entries;
4957
911053932726 Workaround broken AVI files from DC-XZ6.
michael
parents: 4956
diff changeset
997 unsigned int size;
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
998
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
999 if(n <= 0)
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
1000 continue;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
1001
4957
911053932726 Workaround broken AVI files from DC-XZ6.
michael
parents: 4956
diff changeset
1002 if(n >= 2){
911053932726 Workaround broken AVI files from DC-XZ6.
michael
parents: 4956
diff changeset
1003 int64_t pos= st->index_entries[0].pos;
911053932726 Workaround broken AVI files from DC-XZ6.
michael
parents: 4956
diff changeset
1004 url_fseek(s->pb, pos + 4, SEEK_SET);
911053932726 Workaround broken AVI files from DC-XZ6.
michael
parents: 4956
diff changeset
1005 size= get_le32(s->pb);
911053932726 Workaround broken AVI files from DC-XZ6.
michael
parents: 4956
diff changeset
1006 if(pos + size > st->index_entries[1].pos)
911053932726 Workaround broken AVI files from DC-XZ6.
michael
parents: 4956
diff changeset
1007 last_start= INT64_MAX;
911053932726 Workaround broken AVI files from DC-XZ6.
michael
parents: 4956
diff changeset
1008 }
911053932726 Workaround broken AVI files from DC-XZ6.
michael
parents: 4956
diff changeset
1009
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
1010 if(st->index_entries[0].pos > last_start)
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
1011 last_start= st->index_entries[0].pos;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
1012 if(st->index_entries[n-1].pos < first_end)
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
1013 first_end= st->index_entries[n-1].pos;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
1014 }
4957
911053932726 Workaround broken AVI files from DC-XZ6.
michael
parents: 4956
diff changeset
1015 url_fseek(s->pb, oldpos, SEEK_SET);
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
1016 return last_start > first_end;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
1017 }
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
1018
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
1019 static int avi_load_index(AVFormatContext *s)
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
1020 {
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
1021 AVIContext *avi = s->priv_data;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2584
diff changeset
1022 ByteIOContext *pb = s->pb;
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
1023 uint32_t tag, size;
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3908
diff changeset
1024 int64_t pos= url_ftell(pb);
5149
4a53fcd622ea Check for seek failures in avi_load_index, otherwise if the index offset
reimar
parents: 5146
diff changeset
1025 int ret = -1;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
1026
5149
4a53fcd622ea Check for seek failures in avi_load_index, otherwise if the index offset
reimar
parents: 5146
diff changeset
1027 if (url_fseek(pb, avi->movi_end, SEEK_SET) < 0)
4a53fcd622ea Check for seek failures in avi_load_index, otherwise if the index offset
reimar
parents: 5146
diff changeset
1028 goto the_end; // maybe truncated file
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
1029 #ifdef DEBUG_SEEK
1443
404048ea11bc Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
diego
parents: 1441
diff changeset
1030 printf("movi_end=0x%"PRIx64"\n", avi->movi_end);
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
1031 #endif
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
1032 for(;;) {
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
1033 if (url_feof(pb))
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
1034 break;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
1035 tag = get_le32(pb);
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
1036 size = get_le32(pb);
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
1037 #ifdef DEBUG_SEEK
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
1038 printf("tag=%c%c%c%c size=0x%x\n",
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
1039 tag & 0xff,
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
1040 (tag >> 8) & 0xff,
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
1041 (tag >> 16) & 0xff,
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
1042 (tag >> 24) & 0xff,
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
1043 size);
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
1044 #endif
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
1045 switch(tag) {
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
1046 case MKTAG('i', 'd', 'x', '1'):
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
1047 if (avi_read_idx1(s, size) < 0)
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
1048 goto skip;
5149
4a53fcd622ea Check for seek failures in avi_load_index, otherwise if the index offset
reimar
parents: 5146
diff changeset
1049 ret = 0;
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
1050 goto the_end;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
1051 break;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
1052 default:
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
1053 skip:
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
1054 size += (size & 1);
5149
4a53fcd622ea Check for seek failures in avi_load_index, otherwise if the index offset
reimar
parents: 5146
diff changeset
1055 if (url_fseek(pb, size, SEEK_CUR) < 0)
4a53fcd622ea Check for seek failures in avi_load_index, otherwise if the index offset
reimar
parents: 5146
diff changeset
1056 goto the_end; // something is wrong here
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
1057 break;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
1058 }
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
1059 }
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
1060 the_end:
343
538e6791f4c7 fixing some seek failure issues
michael
parents: 340
diff changeset
1061 url_fseek(pb, pos, SEEK_SET);
5149
4a53fcd622ea Check for seek failures in avi_load_index, otherwise if the index offset
reimar
parents: 5146
diff changeset
1062 return ret;
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
1063 }
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
1064
558
89bd76208427 100l (forgoten seeking functions)
michael
parents: 534
diff changeset
1065 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
1066 {
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
1067 AVIContext *avi = s->priv_data;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
1068 AVStream *st;
700
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
1069 int i, index;
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
1070 int64_t pos;
5326
4e1e9ab777a1 Support non interleaved avi files that have 0<size<sample_size.
michael
parents: 5243
diff changeset
1071 AVIStream *ast;
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
1072
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
1073 if (!avi->index_loaded) {
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
1074 /* we only load the index on demand */
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
1075 avi_load_index(s);
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
1076 avi->index_loaded = 1;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
1077 }
700
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
1078 assert(stream_index>= 0);
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
1079
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
1080 st = s->streams[stream_index];
5326
4e1e9ab777a1 Support non interleaved avi files that have 0<size<sample_size.
michael
parents: 5243
diff changeset
1081 ast= st->priv_data;
4e1e9ab777a1 Support non interleaved avi files that have 0<size<sample_size.
michael
parents: 5243
diff changeset
1082 index= av_index_search_timestamp(st, timestamp * FFMAX(ast->sample_size, 1), flags);
700
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
1083 if(index<0)
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
1084 return -1;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
1085
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
1086 /* find the position */
700
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
1087 pos = st->index_entries[index].pos;
5326
4e1e9ab777a1 Support non interleaved avi files that have 0<size<sample_size.
michael
parents: 5243
diff changeset
1088 timestamp = st->index_entries[index].timestamp / FFMAX(ast->sample_size, 1);
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
1089
4515
1d9ace1dec78 Add a context to av_log() calls and modify a function prototype to allow it.
benoit
parents: 4353
diff changeset
1090 // av_log(s, AV_LOG_DEBUG, "XX %"PRId64" %d %"PRId64"\n", timestamp, index, st->index_entries[index].timestamp);
700
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
1091
4210
ec95366371ba replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
aurel
parents: 4203
diff changeset
1092 if (CONFIG_DV_DEMUXER && avi->dv_demux) {
1629
aedce96c28ff * Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents: 1527
diff changeset
1093 /* One and only one real stream for DV in AVI, and it has video */
3365
19bd4caf27a9 consistency cosmetics: indices --> indexes
diego
parents: 3361
diff changeset
1094 /* offsets. Calling with other stream indexes should have failed */
1629
aedce96c28ff * Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents: 1527
diff changeset
1095 /* the av_index_search_timestamp call above. */
aedce96c28ff * Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents: 1527
diff changeset
1096 assert(stream_index == 0);
aedce96c28ff * Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents: 1527
diff changeset
1097
aedce96c28ff * Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents: 1527
diff changeset
1098 /* Feed the DV video stream version of the timestamp to the */
3538
e50efb387048 spelling cosmetics
diego
parents: 3487
diff changeset
1099 /* DV demux so it can synthesize correct timestamps. */
1629
aedce96c28ff * Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents: 1527
diff changeset
1100 dv_offset_reset(avi->dv_demux, timestamp);
aedce96c28ff * Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents: 1527
diff changeset
1101
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2584
diff changeset
1102 url_fseek(s->pb, pos, SEEK_SET);
1629
aedce96c28ff * Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents: 1527
diff changeset
1103 avi->stream_index= -1;
aedce96c28ff * Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents: 1527
diff changeset
1104 return 0;
aedce96c28ff * Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents: 1527
diff changeset
1105 }
aedce96c28ff * Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
romansh
parents: 1527
diff changeset
1106
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
1107 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
1108 AVStream *st2 = s->streams[i];
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
1109 AVIStream *ast2 = st2->priv_data;
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
1110
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
1111 ast2->packet_size=
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
1112 ast2->remaining= 0;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
1113
700
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
1114 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
1115 continue;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
1116
988
fb8b2bb9f716 fixing demuxing of minorityreport.AVI
michael
parents: 984
diff changeset
1117 // assert(st2->codec->block_align);
3610
71ce7d228291 change assert test due to the new reducing of time_base in av_set_pts_info, fix #561
bcoudurier
parents: 3538
diff changeset
1118 assert((int64_t)st2->time_base.num*ast2->rate == (int64_t)st2->time_base.den*ast2->scale);
700
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
1119 index = av_index_search_timestamp(
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
1120 st2,
5326
4e1e9ab777a1 Support non interleaved avi files that have 0<size<sample_size.
michael
parents: 5243
diff changeset
1121 av_rescale_q(timestamp, st->time_base, st2->time_base) * FFMAX(ast2->sample_size, 1),
700
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
1122 flags | AVSEEK_FLAG_BACKWARD);
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
1123 if(index<0)
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
1124 index=0;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 851
diff changeset
1125
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
1126 if(!avi->non_interleaved){
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
1127 while(index>0 && st2->index_entries[index].pos > pos)
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
1128 index--;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
1129 while(index+1 < st2->nb_index_entries && st2->index_entries[index].pos < pos)
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
1130 index++;
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
1131 }
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
1132
4515
1d9ace1dec78 Add a context to av_log() calls and modify a function prototype to allow it.
benoit
parents: 4353
diff changeset
1133 // av_log(s, AV_LOG_DEBUG, "%"PRId64" %d %"PRId64"\n", timestamp, index, st2->index_entries[index].timestamp);
700
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
1134 /* extract the current frame number */
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
1135 ast2->frame_offset = st2->index_entries[index].timestamp;
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
1136 }
700
a5e6e0e61e24 use libavformats index system instead of the half duplicated mess in avidec.c
michael
parents: 673
diff changeset
1137
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
1138 /* do the seek */
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2584
diff changeset
1139 url_fseek(s->pb, pos, SEEK_SET);
701
72dd5e4fd538 non interleaved avi support
michael
parents: 700
diff changeset
1140 avi->stream_index= -1;
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
1141 return 0;
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
1142 }
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
1143
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1144 static int avi_read_close(AVFormatContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1145 {
110
9fd9b0f9e9d8 memleaks
michaelni
parents: 98
diff changeset
1146 int i;
9fd9b0f9e9d8 memleaks
michaelni
parents: 98
diff changeset
1147 AVIContext *avi = s->priv_data;
9fd9b0f9e9d8 memleaks
michaelni
parents: 98
diff changeset
1148
9fd9b0f9e9d8 memleaks
michaelni
parents: 98
diff changeset
1149 for(i=0;i<s->nb_streams;i++) {
9fd9b0f9e9d8 memleaks
michaelni
parents: 98
diff changeset
1150 AVStream *st = s->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
1151 av_free(st->codec->palctrl);
110
9fd9b0f9e9d8 memleaks
michaelni
parents: 98
diff changeset
1152 }
9fd9b0f9e9d8 memleaks
michaelni
parents: 98
diff changeset
1153
262
f174d9c00bce * DV handling was streamlined for both muxing/demuxing and
romansh
parents: 227
diff changeset
1154 if (avi->dv_demux)
f174d9c00bce * DV handling was streamlined for both muxing/demuxing and
romansh
parents: 227
diff changeset
1155 av_free(avi->dv_demux);
f174d9c00bce * DV handling was streamlined for both muxing/demuxing and
romansh
parents: 227
diff changeset
1156
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1157 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1158 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1159
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1160 static int avi_probe(AVProbeData *p)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1161 {
2578
57e0c1296dfe use a table to parse AVI file header
aurel
parents: 2384
diff changeset
1162 int i;
57e0c1296dfe use a table to parse AVI file header
aurel
parents: 2384
diff changeset
1163
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1164 /* check file header */
2578
57e0c1296dfe use a table to parse AVI file header
aurel
parents: 2384
diff changeset
1165 for(i=0; avi_headers[i][0]; i++)
57e0c1296dfe use a table to parse AVI file header
aurel
parents: 2384
diff changeset
1166 if(!memcmp(p->buf , avi_headers[i] , 4) &&
57e0c1296dfe use a table to parse AVI file header
aurel
parents: 2384
diff changeset
1167 !memcmp(p->buf+8, avi_headers[i]+4, 4))
57e0c1296dfe use a table to parse AVI file header
aurel
parents: 2384
diff changeset
1168 return AVPROBE_SCORE_MAX;
57e0c1296dfe use a table to parse AVI file header
aurel
parents: 2384
diff changeset
1169
57e0c1296dfe use a table to parse AVI file header
aurel
parents: 2384
diff changeset
1170 return 0;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1171 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1172
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
1173 AVInputFormat avi_demuxer = {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1174 "avi",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3384
diff changeset
1175 NULL_IF_CONFIG_SMALL("AVI format"),
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1176 sizeof(AVIContext),
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1177 avi_probe,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1178 avi_read_header,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1179 avi_read_packet,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1180 avi_read_close,
311
e07654b1049c initial seek support
bellard
parents: 300
diff changeset
1181 avi_read_seek,
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
1182 };