annotate avidec.c @ 227:b0d2d719ae41 libavformat

hacks to support Xan AVI files
author tmmm
date Mon, 08 Sep 2003 04:17:40 +0000
parents 6c9d6422a2f6
children f174d9c00bce
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"
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
21
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
22 //#define DEBUG
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
23
98
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
24 static const struct AVI1Handler {
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
25 enum CodecID vcid;
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
26 enum CodecID acid;
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
27 uint32_t tag;
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
28 } AVI1Handlers[] = {
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
29 { CODEC_ID_DVVIDEO, CODEC_ID_DVAUDIO, MKTAG('d', 'v', 's', 'd') },
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
30 { CODEC_ID_DVVIDEO, CODEC_ID_DVAUDIO, MKTAG('d', 'v', 'h', 'd') },
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
31 { CODEC_ID_DVVIDEO, CODEC_ID_DVAUDIO, MKTAG('d', 'v', 's', 'l') },
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
32 /* This is supposed to be the last one */
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
33 { CODEC_ID_NONE, CODEC_ID_NONE, 0 },
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
34 };
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
35
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
36 typedef struct AVIIndex {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
37 unsigned char tag[4];
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
38 unsigned int flags, pos, len;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
39 struct AVIIndex *next;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
40 } AVIIndex;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
41
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
42 typedef struct {
92
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
43 int64_t riff_end;
65
a58a8a53eb46 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 45
diff changeset
44 int64_t movi_end;
98
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
45 int type;
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
46 uint8_t *buf;
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
47 int buf_size;
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
48 int stream_index;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
49 offset_t movi_list;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
50 AVIIndex *first, *last;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
51 } AVIContext;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
52
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
53 #ifdef DEBUG
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
54 static void print_tag(const char *str, unsigned int tag, int size)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
55 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
56 printf("%s: tag=%c%c%c%c size=0x%x\n",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
57 str, tag & 0xff,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
58 (tag >> 8) & 0xff,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
59 (tag >> 16) & 0xff,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
60 (tag >> 24) & 0xff,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
61 size);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
62 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
63 #endif
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
64
92
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
65 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
66 {
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
67 uint32_t tag;
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
68 /* check RIFF header */
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
69 tag = get_le32(pb);
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
70
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
71 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
72 return -1;
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
73 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
74 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
75 tag = get_le32(pb);
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
76 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
77 return -1;
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
78
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
79 return 0;
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
80 }
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
81
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
82 static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
83 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
84 AVIContext *avi = s->priv_data;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
85 ByteIOContext *pb = &s->pb;
98
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
86 uint32_t tag, tag1, handler;
75
78bec272ce3a read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents: 73
diff changeset
87 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
88 unsigned int size, nb_frames;
6c9d6422a2f6 update duration and start_time - add av_new_stream() usage
bellard
parents: 149
diff changeset
89 int i, n;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
90 AVStream *st;
227
b0d2d719ae41 hacks to support Xan AVI files
tmmm
parents: 188
diff changeset
91 int xan_video = 0; /* hack to support Xan A/V */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
92
92
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
93 if (get_riff(avi, pb) < 0)
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
94 return -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
95
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
96 /* first list tag */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
97 stream_index = -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
98 codec_type = -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
99 frame_period = 0;
98
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
100 avi->type = 2;
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
101 avi->buf = av_malloc(1);
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
102 if (!avi->buf)
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
103 return -1;
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
104 avi->buf_size = 1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
105 for(;;) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
106 if (url_feof(pb))
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
107 goto fail;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
108 tag = get_le32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
109 size = get_le32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
110 #ifdef DEBUG
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
111 print_tag("tag", tag, size);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
112 #endif
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
113
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
114 switch(tag) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
115 case MKTAG('L', 'I', 'S', 'T'):
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
116 /* ignored, except when start of video packets */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
117 tag1 = get_le32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
118 #ifdef DEBUG
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
119 print_tag("list", tag1, 0);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
120 #endif
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
121 if (tag1 == MKTAG('m', 'o', 'v', 'i')) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
122 avi->movi_end = url_ftell(pb) + size - 4;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
123 #ifdef DEBUG
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
124 printf("movi end=%Lx\n", avi->movi_end);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
125 #endif
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
126 goto end_of_header;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
127 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
128 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
129 case MKTAG('a', 'v', 'i', 'h'):
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
130 /* avi header */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
131 /* using frame_period is bad idea */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
132 frame_period = get_le32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
133 bit_rate = get_le32(pb) * 8;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
134 url_fskip(pb, 4 * 4);
188
6c9d6422a2f6 update duration and start_time - add av_new_stream() usage
bellard
parents: 149
diff changeset
135 n = get_le32(pb);
6c9d6422a2f6 update duration and start_time - add av_new_stream() usage
bellard
parents: 149
diff changeset
136 for(i=0;i<n;i++) {
6c9d6422a2f6 update duration and start_time - add av_new_stream() usage
bellard
parents: 149
diff changeset
137 st = av_new_stream(s, 0);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
138 if (!st)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
139 goto fail;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
140 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
141 url_fskip(pb, size - 7 * 4);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
142 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
143 case MKTAG('s', 't', 'r', 'h'):
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
144 /* stream header */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
145 stream_index++;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
146 tag1 = get_le32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
147 switch(tag1) {
98
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
148 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
149 case MKTAG('i', 'v', 'a', 's'):
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
150 if (s->nb_streams != 1)
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
151 goto fail;
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
152 avi->type = 1;
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
153 avi->stream_index = 0;
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
154 case MKTAG('v', 'i', 'd', 's'):
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
155 codec_type = CODEC_TYPE_VIDEO;
75
78bec272ce3a read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents: 73
diff changeset
156
78bec272ce3a read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents: 73
diff changeset
157 if (stream_index >= s->nb_streams) {
78bec272ce3a read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents: 73
diff changeset
158 url_fskip(pb, size - 4);
78bec272ce3a read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents: 73
diff changeset
159 break;
78bec272ce3a read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents: 73
diff changeset
160 }
78bec272ce3a read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents: 73
diff changeset
161
78bec272ce3a read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents: 73
diff changeset
162 st = s->streams[stream_index];
78bec272ce3a read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents: 73
diff changeset
163
98
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
164 handler = get_le32(pb); /* codec tag */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
165 get_le32(pb); /* flags */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
166 get_le16(pb); /* priority */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
167 get_le16(pb); /* language */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
168 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
169 scale = get_le32(pb); /* scale */
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
170 rate = get_le32(pb); /* rate */
75
78bec272ce3a read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents: 73
diff changeset
171
85
25062c9b1f86 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 84
diff changeset
172 if(scale && rate){
25062c9b1f86 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 84
diff changeset
173 st->codec.frame_rate = rate;
98
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
174 st->codec.frame_rate_base = scale;
85
25062c9b1f86 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 84
diff changeset
175 }else if(frame_period){
25062c9b1f86 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 84
diff changeset
176 st->codec.frame_rate = 1000000;
98
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
177 st->codec.frame_rate_base = frame_period;
85
25062c9b1f86 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 84
diff changeset
178 }else{
25062c9b1f86 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 84
diff changeset
179 st->codec.frame_rate = 25;
25062c9b1f86 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 84
diff changeset
180 st->codec.frame_rate_base = 1;
25062c9b1f86 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 84
diff changeset
181 }
188
6c9d6422a2f6 update duration and start_time - add av_new_stream() usage
bellard
parents: 149
diff changeset
182 get_le32(pb); /* start */
6c9d6422a2f6 update duration and start_time - add av_new_stream() usage
bellard
parents: 149
diff changeset
183 nb_frames = get_le32(pb);
6c9d6422a2f6 update duration and start_time - add av_new_stream() usage
bellard
parents: 149
diff changeset
184 st->start_time = 0;
6c9d6422a2f6 update duration and start_time - add av_new_stream() usage
bellard
parents: 149
diff changeset
185 st->duration = (double)nb_frames *
6c9d6422a2f6 update duration and start_time - add av_new_stream() usage
bellard
parents: 149
diff changeset
186 st->codec.frame_rate_base * AV_TIME_BASE /
6c9d6422a2f6 update duration and start_time - add av_new_stream() usage
bellard
parents: 149
diff changeset
187 st->codec.frame_rate;
75
78bec272ce3a read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents: 73
diff changeset
188
98
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
189 if (avi->type == 1) {
188
6c9d6422a2f6 update duration and start_time - add av_new_stream() usage
bellard
parents: 149
diff changeset
190 AVStream *st;
6c9d6422a2f6 update duration and start_time - add av_new_stream() usage
bellard
parents: 149
diff changeset
191
6c9d6422a2f6 update duration and start_time - add av_new_stream() usage
bellard
parents: 149
diff changeset
192 st = av_new_stream(s, 0);
98
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
193 if (!st)
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
194 goto fail;
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
195
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
196 stream_index++;
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
197
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
198 for (i=0; AVI1Handlers[i].tag != 0; ++i)
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
199 if (AVI1Handlers[i].tag == handler)
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
200 break;
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
201
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
202 if (AVI1Handlers[i].tag != 0) {
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
203 s->streams[0]->codec.codec_type = CODEC_TYPE_VIDEO;
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
204 s->streams[0]->codec.codec_id = AVI1Handlers[i].vcid;
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
205 s->streams[1]->codec.codec_type = CODEC_TYPE_AUDIO;
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
206 s->streams[1]->codec.codec_id = AVI1Handlers[i].acid;
188
6c9d6422a2f6 update duration and start_time - add av_new_stream() usage
bellard
parents: 149
diff changeset
207 } else {
98
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
208 goto fail;
188
6c9d6422a2f6 update duration and start_time - add av_new_stream() usage
bellard
parents: 149
diff changeset
209 }
98
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
210 }
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
211
188
6c9d6422a2f6 update duration and start_time - add av_new_stream() usage
bellard
parents: 149
diff changeset
212 url_fskip(pb, size - 9 * 4);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
213 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
214 case MKTAG('a', 'u', 'd', 's'):
188
6c9d6422a2f6 update duration and start_time - add av_new_stream() usage
bellard
parents: 149
diff changeset
215 {
6c9d6422a2f6 update duration and start_time - add av_new_stream() usage
bellard
parents: 149
diff changeset
216 unsigned int length, rate;
6c9d6422a2f6 update duration and start_time - add av_new_stream() usage
bellard
parents: 149
diff changeset
217
6c9d6422a2f6 update duration and start_time - add av_new_stream() usage
bellard
parents: 149
diff changeset
218 codec_type = CODEC_TYPE_AUDIO;
6c9d6422a2f6 update duration and start_time - add av_new_stream() usage
bellard
parents: 149
diff changeset
219
6c9d6422a2f6 update duration and start_time - add av_new_stream() usage
bellard
parents: 149
diff changeset
220 if (stream_index >= s->nb_streams) {
6c9d6422a2f6 update duration and start_time - add av_new_stream() usage
bellard
parents: 149
diff changeset
221 url_fskip(pb, size - 4);
6c9d6422a2f6 update duration and start_time - add av_new_stream() usage
bellard
parents: 149
diff changeset
222 break;
6c9d6422a2f6 update duration and start_time - add av_new_stream() usage
bellard
parents: 149
diff changeset
223 }
6c9d6422a2f6 update duration and start_time - add av_new_stream() usage
bellard
parents: 149
diff changeset
224 st = s->streams[stream_index];
6c9d6422a2f6 update duration and start_time - add av_new_stream() usage
bellard
parents: 149
diff changeset
225
6c9d6422a2f6 update duration and start_time - add av_new_stream() usage
bellard
parents: 149
diff changeset
226 get_le32(pb); /* tag */
6c9d6422a2f6 update duration and start_time - add av_new_stream() usage
bellard
parents: 149
diff changeset
227 get_le32(pb); /* flags */
6c9d6422a2f6 update duration and start_time - add av_new_stream() usage
bellard
parents: 149
diff changeset
228 get_le16(pb); /* priority */
6c9d6422a2f6 update duration and start_time - add av_new_stream() usage
bellard
parents: 149
diff changeset
229 get_le16(pb); /* language */
6c9d6422a2f6 update duration and start_time - add av_new_stream() usage
bellard
parents: 149
diff changeset
230 get_le32(pb); /* initial frame */
6c9d6422a2f6 update duration and start_time - add av_new_stream() usage
bellard
parents: 149
diff changeset
231 get_le32(pb); /* scale */
6c9d6422a2f6 update duration and start_time - add av_new_stream() usage
bellard
parents: 149
diff changeset
232 rate = get_le32(pb);
6c9d6422a2f6 update duration and start_time - add av_new_stream() usage
bellard
parents: 149
diff changeset
233 get_le32(pb); /* start */
6c9d6422a2f6 update duration and start_time - add av_new_stream() usage
bellard
parents: 149
diff changeset
234 length = get_le32(pb); /* length, in samples or bytes */
6c9d6422a2f6 update duration and start_time - add av_new_stream() usage
bellard
parents: 149
diff changeset
235 st->start_time = 0;
6c9d6422a2f6 update duration and start_time - add av_new_stream() usage
bellard
parents: 149
diff changeset
236 if (rate != 0)
6c9d6422a2f6 update duration and start_time - add av_new_stream() usage
bellard
parents: 149
diff changeset
237 st->duration = (int64_t)length * AV_TIME_BASE / rate;
6c9d6422a2f6 update duration and start_time - add av_new_stream() usage
bellard
parents: 149
diff changeset
238 url_fskip(pb, size - 9 * 4);
6c9d6422a2f6 update duration and start_time - add av_new_stream() usage
bellard
parents: 149
diff changeset
239 }
73
d40ddc73858a reversing not yet reversed changes from r1.7 -> r1.8 except the static/const stuff
michaelni
parents: 65
diff changeset
240 break;
d40ddc73858a reversing not yet reversed changes from r1.7 -> r1.8 except the static/const stuff
michaelni
parents: 65
diff changeset
241 default:
d40ddc73858a reversing not yet reversed changes from r1.7 -> r1.8 except the static/const stuff
michaelni
parents: 65
diff changeset
242 goto fail;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
243 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
244 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
245 case MKTAG('s', 't', 'r', 'f'):
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
246 /* stream header */
98
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
247 if (stream_index >= s->nb_streams || avi->type == 1) {
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
248 url_fskip(pb, size);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
249 } else {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
250 st = s->streams[stream_index];
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
251 switch(codec_type) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
252 case CODEC_TYPE_VIDEO:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
253 get_le32(pb); /* size */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
254 st->codec.width = get_le32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
255 st->codec.height = get_le32(pb);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
256 get_le16(pb); /* panes */
75
78bec272ce3a read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents: 73
diff changeset
257 st->codec.bits_per_sample= get_le16(pb); /* depth */
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
258 tag1 = get_le32(pb);
75
78bec272ce3a read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents: 73
diff changeset
259 get_le32(pb); /* ImageSize */
78bec272ce3a read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents: 73
diff changeset
260 get_le32(pb); /* XPelsPerMeter */
78bec272ce3a read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents: 73
diff changeset
261 get_le32(pb); /* YPelsPerMeter */
78bec272ce3a read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents: 73
diff changeset
262 get_le32(pb); /* ClrUsed */
78bec272ce3a read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents: 73
diff changeset
263 get_le32(pb); /* ClrImportant */
78bec272ce3a read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents: 73
diff changeset
264
78bec272ce3a read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents: 73
diff changeset
265 st->codec.extradata_size= size - 10*4;
110
9fd9b0f9e9d8 memleaks
michaelni
parents: 98
diff changeset
266 st->codec.extradata= av_malloc(st->codec.extradata_size);
75
78bec272ce3a read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents: 73
diff changeset
267 get_buffer(pb, st->codec.extradata, st->codec.extradata_size);
76
d03c70b7b50d huffyuv encoding fixed
michaelni
parents: 75
diff changeset
268
d03c70b7b50d huffyuv encoding fixed
michaelni
parents: 75
diff changeset
269 if(st->codec.extradata_size & 1) //FIXME check if the encoder really did this correctly
d03c70b7b50d huffyuv encoding fixed
michaelni
parents: 75
diff changeset
270 get_byte(pb);
75
78bec272ce3a read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents: 73
diff changeset
271
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
272 #ifdef DEBUG
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
273 print_tag("video", tag1, 0);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
274 #endif
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
275 st->codec.codec_type = CODEC_TYPE_VIDEO;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
276 st->codec.codec_tag = tag1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
277 st->codec.codec_id = codec_get_id(codec_bmp_tags, tag1);
227
b0d2d719ae41 hacks to support Xan AVI files
tmmm
parents: 188
diff changeset
278 if (st->codec.codec_id == CODEC_ID_XAN_WC4)
b0d2d719ae41 hacks to support Xan AVI files
tmmm
parents: 188
diff changeset
279 xan_video = 1;
75
78bec272ce3a read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
michaelni
parents: 73
diff changeset
280 // url_fskip(pb, size - 5 * 4);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
281 break;
73
d40ddc73858a reversing not yet reversed changes from r1.7 -> r1.8 except the static/const stuff
michaelni
parents: 65
diff changeset
282 case CODEC_TYPE_AUDIO:
84
0068a6902911 correct AUDIO strf parsing patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 82
diff changeset
283 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
284 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
285 url_fskip(pb, 1);
227
b0d2d719ae41 hacks to support Xan AVI files
tmmm
parents: 188
diff changeset
286 /* special case time: To support Xan DPCM, hardcode
b0d2d719ae41 hacks to support Xan AVI files
tmmm
parents: 188
diff changeset
287 * the format if Xxan is the video codec */
b0d2d719ae41 hacks to support Xan AVI files
tmmm
parents: 188
diff changeset
288 if (xan_video)
b0d2d719ae41 hacks to support Xan AVI files
tmmm
parents: 188
diff changeset
289 st->codec.codec_id = CODEC_ID_XAN_DPCM;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
290 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
291 default:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
292 url_fskip(pb, size);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
293 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
294 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
295 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
296 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
297 default:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
298 /* skip tag */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
299 size += (size & 1);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
300 url_fskip(pb, size);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
301 break;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
302 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
303 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
304 end_of_header:
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
305 /* check stream number */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
306 if (stream_index != s->nb_streams - 1) {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
307 fail:
110
9fd9b0f9e9d8 memleaks
michaelni
parents: 98
diff changeset
308 av_free(avi->buf);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
309 for(i=0;i<s->nb_streams;i++) {
80
michaelni
parents: 78
diff changeset
310 av_freep(&s->streams[i]->codec.extradata);
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
311 av_freep(&s->streams[i]);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
312 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
313 return -1;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
314 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
315
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
316 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
317 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
318
98
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
319 static void __destruct_pkt(struct AVPacket *pkt)
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
320 {
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
321 pkt->data = NULL; pkt->size = 0;
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
322 return;
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
323 }
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
324
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
325 static int avi_read_packet(AVFormatContext *s, AVPacket *pkt)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
326 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
327 AVIContext *avi = s->priv_data;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
328 ByteIOContext *pb = &s->pb;
82
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
329 int n, d[8], size, i;
98
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
330
82
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
331 memset(d, -1, sizeof(int)*8);
149
f4de8f9c39bd use custom packet allocation only for DV
bellard
parents: 119
diff changeset
332
f4de8f9c39bd use custom packet allocation only for DV
bellard
parents: 119
diff changeset
333 if (avi->type == 1 && avi->stream_index) {
f4de8f9c39bd use custom packet allocation only for DV
bellard
parents: 119
diff changeset
334 /* duplicate DV packet */
f4de8f9c39bd use custom packet allocation only for DV
bellard
parents: 119
diff changeset
335 av_init_packet(pkt);
f4de8f9c39bd use custom packet allocation only for DV
bellard
parents: 119
diff changeset
336 pkt->data = avi->buf;
f4de8f9c39bd use custom packet allocation only for DV
bellard
parents: 119
diff changeset
337 pkt->size = avi->buf_size;
f4de8f9c39bd use custom packet allocation only for DV
bellard
parents: 119
diff changeset
338 pkt->destruct = __destruct_pkt;
f4de8f9c39bd use custom packet allocation only for DV
bellard
parents: 119
diff changeset
339 pkt->stream_index = avi->stream_index;
f4de8f9c39bd use custom packet allocation only for DV
bellard
parents: 119
diff changeset
340 avi->stream_index = !avi->stream_index;
f4de8f9c39bd use custom packet allocation only for DV
bellard
parents: 119
diff changeset
341 return 0;
f4de8f9c39bd use custom packet allocation only for DV
bellard
parents: 119
diff changeset
342 }
98
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
343
92
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
344 for(i=url_ftell(pb); !url_feof(pb); i++) {
82
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
345 int j;
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
346
92
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
347 if (i >= avi->movi_end) { /* Let's see if it's an OpenDML AVI */
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
348 uint32_t tag, size, tag2;
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
349 url_fskip(pb, avi->riff_end - url_ftell(pb));
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
350 if (get_riff(avi, pb) < 0)
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
351 return -1;
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
352
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
353 tag = get_le32(pb);
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
354 size = get_le32(pb);
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
355 tag2 = get_le32(pb);
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
356 if (tag == MKTAG('L','I','S','T') && tag2 == MKTAG('m','o','v','i'))
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
357 avi->movi_end = url_ftell(pb) + size - 4;
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
358 else
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
359 return -1;
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
360 }
5a4b5f03d13e OpenDML AVI > 2Gb support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 91
diff changeset
361
82
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
362 for(j=0; j<7; j++)
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
363 d[j]= d[j+1];
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
364 d[7]= get_byte(pb);
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
365
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
366 size= d[4] + (d[5]<<8) + (d[6]<<16) + (d[7]<<24);
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
367
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
368 //parse ix##
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
369 n= (d[2] - '0') * 10 + (d[3] - '0');
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
370 if( d[2] >= '0' && d[2] <= '9'
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
371 && d[3] >= '0' && d[3] <= '9'
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
372 && d[0] == 'i' && d[1] == 'x'
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
373 && n < s->nb_streams
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
374 && i + size <= avi->movi_end){
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
375
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
376 url_fskip(pb, size);
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
377 }
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
378
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
379 //parse ##dc/##wb
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
380 n= (d[0] - '0') * 10 + (d[1] - '0');
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
381 if( d[0] >= '0' && d[0] <= '9'
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
382 && d[1] >= '0' && d[1] <= '9'
98
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
383 && ((d[2] == 'd' && d[3] == 'c') ||
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
384 (d[2] == 'w' && d[3] == 'b') ||
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
385 (d[2] == 'd' && d[3] == 'b') ||
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
386 (d[2] == '_' && d[3] == '_'))
82
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
387 && n < s->nb_streams
98
cae6ddfadf51 AVI type 1 support patch by (Roman Shaposhnick <rvs at sun dot com>)
michaelni
parents: 92
diff changeset
388 && i + size <= avi->movi_end) {
82
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
389
149
f4de8f9c39bd use custom packet allocation only for DV
bellard
parents: 119
diff changeset
390 if (avi->type == 1) {
f4de8f9c39bd use custom packet allocation only for DV
bellard
parents: 119
diff changeset
391 uint8_t *tbuf = av_realloc(avi->buf, size + FF_INPUT_BUFFER_PADDING_SIZE);
f4de8f9c39bd use custom packet allocation only for DV
bellard
parents: 119
diff changeset
392 if (!tbuf)
f4de8f9c39bd use custom packet allocation only for DV
bellard
parents: 119
diff changeset
393 return -1;
f4de8f9c39bd use custom packet allocation only for DV
bellard
parents: 119
diff changeset
394 avi->buf = tbuf;
f4de8f9c39bd use custom packet allocation only for DV
bellard
parents: 119
diff changeset
395 avi->buf_size = size;
f4de8f9c39bd use custom packet allocation only for DV
bellard
parents: 119
diff changeset
396 av_init_packet(pkt);
f4de8f9c39bd use custom packet allocation only for DV
bellard
parents: 119
diff changeset
397 pkt->data = avi->buf;
f4de8f9c39bd use custom packet allocation only for DV
bellard
parents: 119
diff changeset
398 pkt->size = avi->buf_size;
f4de8f9c39bd use custom packet allocation only for DV
bellard
parents: 119
diff changeset
399 pkt->destruct = __destruct_pkt;
f4de8f9c39bd use custom packet allocation only for DV
bellard
parents: 119
diff changeset
400 avi->stream_index = n;
f4de8f9c39bd use custom packet allocation only for DV
bellard
parents: 119
diff changeset
401 } else {
f4de8f9c39bd use custom packet allocation only for DV
bellard
parents: 119
diff changeset
402 av_new_packet(pkt, size);
f4de8f9c39bd use custom packet allocation only for DV
bellard
parents: 119
diff changeset
403 }
f4de8f9c39bd use custom packet allocation only for DV
bellard
parents: 119
diff changeset
404 get_buffer(pb, pkt->data, size);
f4de8f9c39bd use custom packet allocation only for DV
bellard
parents: 119
diff changeset
405 if (size & 1)
f4de8f9c39bd use custom packet allocation only for DV
bellard
parents: 119
diff changeset
406 get_byte(pb);
f4de8f9c39bd use custom packet allocation only for DV
bellard
parents: 119
diff changeset
407 pkt->stream_index = n;
f4de8f9c39bd use custom packet allocation only for DV
bellard
parents: 119
diff changeset
408 pkt->flags |= PKT_FLAG_KEY; // FIXME: We really should read index for that
f4de8f9c39bd use custom packet allocation only for DV
bellard
parents: 119
diff changeset
409 return 0;
82
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
410 }
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
411 }
33753bc4869e fixing parsing of opendml avis
michaelni
parents: 80
diff changeset
412 return -1;
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
413 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
414
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
415 static int avi_read_close(AVFormatContext *s)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
416 {
110
9fd9b0f9e9d8 memleaks
michaelni
parents: 98
diff changeset
417 int i;
9fd9b0f9e9d8 memleaks
michaelni
parents: 98
diff changeset
418 AVIContext *avi = s->priv_data;
9fd9b0f9e9d8 memleaks
michaelni
parents: 98
diff changeset
419 av_free(avi->buf);
9fd9b0f9e9d8 memleaks
michaelni
parents: 98
diff changeset
420
9fd9b0f9e9d8 memleaks
michaelni
parents: 98
diff changeset
421 for(i=0;i<s->nb_streams;i++) {
9fd9b0f9e9d8 memleaks
michaelni
parents: 98
diff changeset
422 AVStream *st = s->streams[i];
9fd9b0f9e9d8 memleaks
michaelni
parents: 98
diff changeset
423 // av_free(st->priv_data);
9fd9b0f9e9d8 memleaks
michaelni
parents: 98
diff changeset
424 av_free(st->codec.extradata);
9fd9b0f9e9d8 memleaks
michaelni
parents: 98
diff changeset
425 }
9fd9b0f9e9d8 memleaks
michaelni
parents: 98
diff changeset
426
0
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
427 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
428 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
429
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
430 static int avi_probe(AVProbeData *p)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
431 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
432 /* check file header */
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
433 if (p->buf_size <= 32)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
434 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
435 if (p->buf[0] == 'R' && p->buf[1] == 'I' &&
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
436 p->buf[2] == 'F' && p->buf[3] == 'F' &&
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
437 p->buf[8] == 'A' && p->buf[9] == 'V' &&
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
438 p->buf[10] == 'I' && p->buf[11] == ' ')
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
439 return AVPROBE_SCORE_MAX;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
440 else
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
441 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
442 }
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
443
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
444 static AVInputFormat avi_iformat = {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
445 "avi",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
446 "avi format",
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
447 sizeof(AVIContext),
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
448 avi_probe,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
449 avi_read_header,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
450 avi_read_packet,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
451 avi_read_close,
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
452 };
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
453
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
454 int avidec_init(void)
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
455 {
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
456 av_register_input_format(&avi_iformat);
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
457 return 0;
05318cf2e886 renamed libav to libavformat
bellard
parents:
diff changeset
458 }