annotate avidec.c @ 700:a5e6e0e61e24 libavformat

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