Mercurial > mplayer.hg
annotate libmpdemux/demux_real.c @ 13427:9d0b052c4f74
setting samplesize to 2 in decoders where neccessary.
Needed because initialization of sh_audio was moved from dec_audio to
demuxer.c, and some demuxers set samplesize incorrect or to 0.
author | reimar |
---|---|
date | Tue, 21 Sep 2004 20:34:47 +0000 |
parents | 0945a0a7ed98 |
children | 3041b42a82fd |
rev | line source |
---|---|
3777 | 1 /* |
2 Real parser & demuxer | |
3 | |
10368 | 4 (C) Alex Beregszaszi |
3777 | 5 |
6 Based on FFmpeg's libav/rm.c. | |
5083
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
7 |
3795 | 8 Audio codecs: (supported by RealPlayer8 for Linux) |
4235 | 9 DNET - RealAudio 3.0, really it's AC3 in swapped-byteorder |
3985
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
10 SIPR - SiproLab's audio codec, ACELP decoder working with MPlayer, |
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
11 needs fine-tuning too :) |
5918
dca3016882cf
completed real seeking - working very well with audio only files
alex
parents:
5810
diff
changeset
|
12 ATRC - RealAudio 8 (ATRAC3) - www.minidisc.org/atrac3_article.pdf, |
dca3016882cf
completed real seeking - working very well with audio only files
alex
parents:
5810
diff
changeset
|
13 ACM decoder uploaded, needs some fine-tuning to work |
dca3016882cf
completed real seeking - working very well with audio only files
alex
parents:
5810
diff
changeset
|
14 -> RealAudio 8 |
dca3016882cf
completed real seeking - working very well with audio only files
alex
parents:
5810
diff
changeset
|
15 COOK/COKR - Real Cooker -> RealAudio G2 |
3795 | 16 |
17 Video codecs: (supported by RealPlayer8 for Linux) | |
3985
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
18 RV10 - H.263 based, working with libavcodec's decoder |
8109
cb4c507c69aa
ASF-style stream auto-selection, to fix files with fake a/v streams (only
arpi
parents:
8094
diff
changeset
|
19 RV20-RV40 - using RealPlayer's codec plugins |
3788 | 20 */ |
21 | |
3777 | 22 #include <stdio.h> |
23 #include <stdlib.h> | |
24 #include <unistd.h> | |
25 | |
26 #include "config.h" | |
27 #include "mp_msg.h" | |
28 #include "help_mp.h" | |
29 | |
30 #include "stream.h" | |
31 #include "demuxer.h" | |
32 #include "stheader.h" | |
33 #include "bswap.h" | |
34 | |
6369 | 35 //#define mp_dbg(mod,lev, args... ) mp_msg_c((mod<<8)|lev, ## args ) |
36 | |
3777 | 37 #define MKTAG(a, b, c, d) (a | (b << 8) | (c << 16) | (d << 24)) |
38 | |
5083
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
39 #define MAX_STREAMS 32 |
3777 | 40 |
41 typedef struct { | |
3985
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
42 int timestamp; |
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
43 int offset; |
11596
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
44 // int packetno; |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
45 // int len; /* only filled by our index generator */ |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
46 // int flags; /* only filled by our index generator */ |
3985
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
47 } real_index_table_t; |
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
48 |
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
49 typedef struct { |
3882
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
50 /* for seeking */ |
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
51 int index_chunk_offset; |
3985
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
52 real_index_table_t *index_table[MAX_STREAMS]; |
11441 | 53 |
3985
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
54 // int *index_table[MAX_STREAMS]; |
3882
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
55 int index_table_size[MAX_STREAMS]; |
11596
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
56 int index_malloc_size[MAX_STREAMS]; |
3882
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
57 int data_chunk_offset; |
3777 | 58 int num_of_packets; |
3882
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
59 int current_packet; |
11441 | 60 |
61 // need for seek | |
62 int audio_need_keyframe; | |
63 int video_after_seek; | |
5083
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
64 |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
65 int current_apacket; |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
66 int current_vpacket; |
3882
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
67 |
6423 | 68 // timestamp correction: |
9555 | 69 int kf_base;// timestamp of the prev. video keyframe |
6423 | 70 int kf_pts; // timestamp of next video keyframe |
71 int a_pts; // previous audio timestamp | |
72 float v_pts; // previous video timestamp | |
11441 | 73 unsigned long duration; |
6423 | 74 |
3882
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
75 /* stream id table */ |
7710 | 76 // int last_a_stream; |
77 // int a_streams[MAX_STREAMS]; | |
78 // int last_v_stream; | |
79 // int v_streams[MAX_STREAMS]; | |
3777 | 80 } real_priv_t; |
81 | |
3985
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
82 /* originally from FFmpeg */ |
3777 | 83 static void get_str(int isbyte, demuxer_t *demuxer, char *buf, int buf_size) |
84 { | |
3985
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
85 int len; |
3777 | 86 |
87 if (isbyte) | |
88 len = stream_read_char(demuxer->stream); | |
89 else | |
90 len = stream_read_word(demuxer->stream); | |
3882
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
91 |
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
92 stream_read(demuxer->stream, buf, (len > buf_size) ? buf_size : len); |
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
93 if (len > buf_size) |
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
94 stream_skip(demuxer->stream, len-buf_size); |
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
95 |
11870 | 96 mp_msg(MSGT_DEMUX, MSGL_V, "read_str: %d bytes read\n", len); |
3777 | 97 } |
98 | |
99 static void skip_str(int isbyte, demuxer_t *demuxer) | |
100 { | |
101 int len; | |
102 | |
103 if (isbyte) | |
104 len = stream_read_char(demuxer->stream); | |
105 else | |
106 len = stream_read_word(demuxer->stream); | |
107 | |
108 stream_skip(demuxer->stream, len); | |
109 | |
11870 | 110 mp_msg(MSGT_DEMUX, MSGL_V, "skip_str: %d bytes skipped\n", len); |
3777 | 111 } |
112 | |
5083
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
113 static void dump_index(demuxer_t *demuxer, int stream_id) |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
114 { |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
115 real_priv_t *priv = demuxer->priv; |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
116 real_index_table_t *index; |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
117 int i, entries; |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
118 |
8027 | 119 if (verbose<=0) |
5083
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
120 return; |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
121 |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
122 if (stream_id > MAX_STREAMS) |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
123 return; |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
124 |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
125 index = priv->index_table[stream_id]; |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
126 entries = priv->index_table_size[stream_id]; |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
127 |
11870 | 128 mp_msg(MSGT_DEMUX, MSGL_V, "Index table for stream %d\n", stream_id); |
5083
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
129 for (i = 0; i < entries; i++) |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
130 { |
11596
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
131 #if 1 |
11870 | 132 mp_msg(MSGT_DEMUX, MSGL_V,"i: %d, pos: %d, timestamp: %d\n", i, index[i].offset, index[i].timestamp); |
11596
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
133 #else |
11870 | 134 mp_msg(MSGT_DEMUX, MSGL_V,"packetno: %x pos: %x len: %x timestamp: %x flags: %x\n", |
5083
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
135 index[i].packetno, index[i].offset, index[i].len, index[i].timestamp, |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
136 index[i].flags); |
11596
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
137 #endif |
5083
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
138 } |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
139 } |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
140 |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
141 static int parse_index_chunk(demuxer_t *demuxer) |
3882
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
142 { |
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
143 real_priv_t *priv = demuxer->priv; |
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
144 int origpos = stream_tell(demuxer->stream); |
3985
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
145 int next_header_pos = priv->index_chunk_offset; |
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
146 int i, entries, stream_id; |
3882
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
147 |
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
148 read_index: |
3985
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
149 stream_seek(demuxer->stream, next_header_pos); |
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
150 |
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
151 i = stream_read_dword_le(demuxer->stream); |
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
152 if ((i == -256) || (i != MKTAG('I', 'N', 'D', 'X'))) |
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
153 { |
11870 | 154 mp_msg(MSGT_DEMUX, MSGL_WARN,"Something went wrong, no index chunk found on given address (%d)\n", |
3985
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
155 next_header_pos); |
11441 | 156 index_mode = -1; |
157 if (i == -256) | |
158 stream_reset(demuxer->stream); | |
159 stream_seek(demuxer->stream, origpos); | |
160 return 0; | |
161 //goto end; | |
3985
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
162 } |
3882
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
163 |
11870 | 164 mp_msg(MSGT_DEMUX, MSGL_V,"Reading index table from index chunk (%d)\n", |
3985
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
165 next_header_pos); |
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
166 |
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
167 i = stream_read_dword(demuxer->stream); |
11870 | 168 mp_msg(MSGT_DEMUX, MSGL_V,"size: %d bytes\n", i); |
3985
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
169 |
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
170 i = stream_read_word(demuxer->stream); |
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
171 if (i != 0) |
11870 | 172 mp_msg(MSGT_DEMUX, MSGL_WARN,"Hmm, index table with unknown version (%d), please report it to MPlayer developers!\n", i); |
3985
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
173 |
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
174 entries = stream_read_dword(demuxer->stream); |
11870 | 175 mp_msg(MSGT_DEMUX, MSGL_V,"entries: %d\n", entries); |
3985
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
176 |
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
177 stream_id = stream_read_word(demuxer->stream); |
11870 | 178 mp_msg(MSGT_DEMUX, MSGL_V,"stream_id: %d\n", stream_id); |
3985
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
179 |
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
180 next_header_pos = stream_read_dword(demuxer->stream); |
11870 | 181 mp_msg(MSGT_DEMUX, MSGL_V,"next_header_pos: %d\n", next_header_pos); |
3882
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
182 if (entries <= 0) |
3985
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
183 { |
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
184 if (next_header_pos) |
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
185 goto read_index; |
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
186 i = entries; |
3882
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
187 goto end; |
3985
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
188 } |
3882
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
189 |
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
190 priv->index_table_size[stream_id] = entries; |
3985
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
191 priv->index_table[stream_id] = malloc(priv->index_table_size[stream_id] * sizeof(real_index_table_t)); |
3882
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
192 |
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
193 for (i = 0; i < entries; i++) |
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
194 { |
3985
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
195 stream_skip(demuxer->stream, 2); /* version */ |
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
196 priv->index_table[stream_id][i].timestamp = stream_read_dword(demuxer->stream); |
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
197 priv->index_table[stream_id][i].offset = stream_read_dword(demuxer->stream); |
11596
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
198 stream_skip(demuxer->stream, 4); /* packetno */ |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
199 // priv->index_table[stream_id][i].packetno = stream_read_dword(demuxer->stream); |
5083
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
200 // printf("Index table: Stream#%d: entry: %d: pos: %d\n", |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
201 // stream_id, i, priv->index_table[stream_id][i].offset); |
3882
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
202 } |
3985
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
203 |
5083
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
204 dump_index(demuxer, stream_id); |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
205 |
3985
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
206 if (next_header_pos > 0) |
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
207 goto read_index; |
3882
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
208 |
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
209 end: |
3985
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
210 if (i == -256) |
3882
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
211 stream_reset(demuxer->stream); |
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
212 stream_seek(demuxer->stream, origpos); |
5083
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
213 if (i == -256) |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
214 return 0; |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
215 else |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
216 return 1; |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
217 } |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
218 |
11596
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
219 #if 1 |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
220 |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
221 static void add_index_item(demuxer_t *demuxer, int stream_id, int timestamp, int offset) |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
222 { |
12665
751a27fc8895
index creation/reading behaviour just like the avi demuxer, patch based on work by Reza Jelveh, Moritz Bunkus und myself
alex
parents:
12367
diff
changeset
|
223 if ((unsigned)stream_id < MAX_STREAMS) |
11596
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
224 { |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
225 real_priv_t *priv = demuxer->priv; |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
226 real_index_table_t *index; |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
227 if (priv->index_table_size[stream_id] >= priv->index_malloc_size[stream_id]) |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
228 { |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
229 if (priv->index_malloc_size[stream_id] == 0) |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
230 priv->index_malloc_size[stream_id] = 2048; |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
231 else |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
232 priv->index_malloc_size[stream_id] += priv->index_malloc_size[stream_id] / 2; |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
233 priv->index_table[stream_id] = realloc(priv->index_table[stream_id], priv->index_malloc_size[stream_id]*sizeof(priv->index_table[0][0])); |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
234 } |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
235 if (priv->index_table_size[stream_id] > 0) |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
236 { |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
237 index = &priv->index_table[stream_id][priv->index_table_size[stream_id] - 1]; |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
238 if (index->timestamp >= timestamp || index->offset >= offset) |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
239 return; |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
240 } |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
241 index = &priv->index_table[stream_id][priv->index_table_size[stream_id]++]; |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
242 index->timestamp = timestamp; |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
243 index->offset = offset; |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
244 } |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
245 } |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
246 |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
247 static void add_index_segment(demuxer_t *demuxer, int seek_stream_id, int seek_timestamp) |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
248 { |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
249 int tag, len, stream_id, timestamp, flags; |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
250 if (seek_timestamp != -1 && (unsigned)seek_stream_id >= MAX_STREAMS) |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
251 return; |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
252 while (1) |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
253 { |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
254 demuxer->filepos = stream_tell(demuxer->stream); |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
255 |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
256 tag = stream_read_dword(demuxer->stream); |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
257 if (tag == MKTAG('A', 'T', 'A', 'D')) |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
258 { |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
259 stream_skip(demuxer->stream, 14); |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
260 continue; /* skip to next loop */ |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
261 } |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
262 len = tag & 0xffff; |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
263 if (tag == -256 || len < 12) |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
264 break; |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
265 |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
266 stream_id = stream_read_word(demuxer->stream); |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
267 timestamp = stream_read_dword(demuxer->stream); |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
268 |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
269 stream_skip(demuxer->stream, 1); /* reserved */ |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
270 flags = stream_read_char(demuxer->stream); |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
271 |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
272 if (flags == -256) |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
273 break; |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
274 |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
275 if (flags & 2) |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
276 { |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
277 add_index_item(demuxer, stream_id, timestamp, demuxer->filepos); |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
278 if (stream_id == seek_stream_id && timestamp >= seek_timestamp) |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
279 { |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
280 stream_seek(demuxer->stream, demuxer->filepos); |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
281 return; |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
282 } |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
283 } |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
284 // printf("Index: stream=%d packet=%d timestamp=%d len=%d flags=0x%x datapos=0x%x\n", stream_id, entries, timestamp, len, flags, index->offset); |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
285 /* skip data */ |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
286 stream_skip(demuxer->stream, len-12); |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
287 } |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
288 } |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
289 |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
290 static int generate_index(demuxer_t *demuxer) |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
291 { |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
292 real_priv_t *priv = demuxer->priv; |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
293 int origpos = stream_tell(demuxer->stream); |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
294 int data_pos = priv->data_chunk_offset-10; |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
295 int i; |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
296 int tag; |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
297 |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
298 stream_seek(demuxer->stream, data_pos); |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
299 tag = stream_read_dword(demuxer->stream); |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
300 if (tag != MKTAG('A', 'T', 'A', 'D')) |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
301 { |
11870 | 302 mp_msg(MSGT_DEMUX, MSGL_WARN,"Something went wrong, no data chunk found on given address (%d)\n", data_pos); |
11596
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
303 } |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
304 else |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
305 { |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
306 stream_skip(demuxer->stream, 14); |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
307 add_index_segment(demuxer, -1, -1); |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
308 } |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
309 for (i = 0; i < MAX_STREAMS; i++) |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
310 { |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
311 if (priv->index_table_size[i] > 0) |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
312 { |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
313 dump_index(demuxer, i); |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
314 } |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
315 } |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
316 stream_reset(demuxer->stream); |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
317 stream_seek(demuxer->stream, origpos); |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
318 return 0; |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
319 } |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
320 |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
321 #else |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
322 |
5083
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
323 static int generate_index(demuxer_t *demuxer) |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
324 { |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
325 real_priv_t *priv = demuxer->priv; |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
326 int origpos = stream_tell(demuxer->stream); |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
327 int data_pos = priv->data_chunk_offset-10; |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
328 int num_of_packets = 0; |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
329 int i, entries = 0; |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
330 int len, stream_id = 0, timestamp, flags; |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
331 int tab_pos = 0; |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
332 |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
333 read_index: |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
334 stream_seek(demuxer->stream, data_pos); |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
335 |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
336 i = stream_read_dword_le(demuxer->stream); |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
337 if ((i == -256) || (i != MKTAG('D', 'A', 'T', 'A'))) |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
338 { |
11870 | 339 mp_msg(MSGT_DEMUX, MSGL_WARN,"Something went wrong, no data chunk found on given address (%d)\n", |
5083
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
340 data_pos); |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
341 goto end; |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
342 } |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
343 stream_skip(demuxer->stream, 4); /* chunk size */ |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
344 stream_skip(demuxer->stream, 2); /* version */ |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
345 |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
346 num_of_packets = stream_read_dword(demuxer->stream); |
11870 | 347 mp_msg(MSGT_DEMUX, MSGL_V,"Generating index table from raw data (pos: 0x%x) for %d packets\n", |
5083
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
348 data_pos, num_of_packets); |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
349 |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
350 data_pos = stream_read_dword_le(demuxer->stream)-10; /* next data chunk */ |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
351 |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
352 for (i = 0; i < MAX_STREAMS; i++) |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
353 { |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
354 priv->index_table_size[i] = num_of_packets; |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
355 priv->index_table[i] = malloc(priv->index_table_size[i] * sizeof(real_index_table_t)); |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
356 // priv->index_table[stream_id] = realloc(priv->index_table[stream_id], |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
357 // priv->index_table_size[stream_id] * sizeof(real_index_table_t)); |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
358 } |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
359 |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
360 tab_pos = 0; |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
361 |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
362 // memset(priv->index_table_size, 0, sizeof(int)*MAX_STREAMS); |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
363 // memset(priv->index_table, 0, sizeof(real_index_table_t)*MAX_STREAMS); |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
364 |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
365 while (tab_pos < num_of_packets) |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
366 { |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
367 i = stream_read_char(demuxer->stream); |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
368 if (i == -256) |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
369 goto end; |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
370 stream_skip(demuxer->stream, 1); |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
371 // stream_skip(demuxer->stream, 2); /* version */ |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
372 |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
373 len = stream_read_word(demuxer->stream); |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
374 stream_id = stream_read_word(demuxer->stream); |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
375 timestamp = stream_read_dword(demuxer->stream); |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
376 |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
377 stream_skip(demuxer->stream, 1); /* reserved */ |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
378 flags = stream_read_char(demuxer->stream); |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
379 |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
380 i = tab_pos; |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
381 |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
382 // priv->index_table_size[stream_id] = i; |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
383 // if (priv->index_table[stream_id] == NULL) |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
384 // priv->index_table[stream_id] = malloc(priv->index_table_size[stream_id] * sizeof(real_index_table_t)); |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
385 // else |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
386 // priv->index_table[stream_id] = realloc(priv->index_table[stream_id], |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
387 // priv->index_table_size[stream_id] * sizeof(real_index_table_t)); |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
388 |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
389 priv->index_table[stream_id][i].timestamp = timestamp; |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
390 priv->index_table[stream_id][i].offset = stream_tell(demuxer->stream)-12; |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
391 priv->index_table[stream_id][i].len = len; |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
392 priv->index_table[stream_id][i].packetno = entries; |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
393 priv->index_table[stream_id][i].flags = flags; |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
394 |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
395 tab_pos++; |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
396 |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
397 /* skip data */ |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
398 stream_skip(demuxer->stream, len-12); |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
399 } |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
400 dump_index(demuxer, stream_id); |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
401 if (data_pos) |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
402 goto read_index; |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
403 |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
404 end: |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
405 if (i == -256) |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
406 stream_reset(demuxer->stream); |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
407 stream_seek(demuxer->stream, origpos); |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
408 if (i == -256) |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
409 return 0; |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
410 else |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
411 return 1; |
3882
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
412 } |
11596
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
413 #endif |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
414 |
3882
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
415 |
3795 | 416 int real_check_file(demuxer_t* demuxer) |
417 { | |
3777 | 418 real_priv_t *priv; |
419 int c; | |
420 | |
421 mp_msg(MSGT_DEMUX,MSGL_V,"Checking for REAL\n"); | |
422 | |
423 c = stream_read_dword_le(demuxer->stream); | |
424 if (c == -256) | |
425 return 0; /* EOF */ | |
426 if (c != MKTAG('.', 'R', 'M', 'F')) | |
427 return 0; /* bad magic */ | |
428 | |
429 priv = malloc(sizeof(real_priv_t)); | |
430 memset(priv, 0, sizeof(real_priv_t)); | |
431 demuxer->priv = priv; | |
432 | |
433 return 1; | |
434 } | |
435 | |
6340
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
436 void hexdump(char *, unsigned long); |
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
437 |
9543 | 438 #define SKIP_BITS(n) buffer<<=n |
439 #define SHOW_BITS(n) ((buffer)>>(32-(n))) | |
440 | |
6995
8f92313a0cd5
RV20 A-V desync fixed - use timestamp hack only for RV30
arpi
parents:
6982
diff
changeset
|
441 static float real_fix_timestamp(real_priv_t* priv, unsigned char* s, int timestamp, float frametime, unsigned int format){ |
8f92313a0cd5
RV20 A-V desync fixed - use timestamp hack only for RV30
arpi
parents:
6982
diff
changeset
|
442 float v_pts; |
9543 | 443 uint32_t buffer= (s[0]<<24) + (s[1]<<16) + (s[2]<<8) + s[3]; |
6995
8f92313a0cd5
RV20 A-V desync fixed - use timestamp hack only for RV30
arpi
parents:
6982
diff
changeset
|
444 int kf=timestamp; |
9543 | 445 int pict_type; |
9555 | 446 int orig_kf; |
447 | |
448 #if 1 | |
9543 | 449 if(format==mmioFOURCC('R','V','3','0') || format==mmioFOURCC('R','V','4','0')){ |
450 if(format==mmioFOURCC('R','V','3','0')){ | |
451 SKIP_BITS(3); | |
452 pict_type= SHOW_BITS(2); | |
453 SKIP_BITS(2 + 7); | |
454 }else{ | |
455 SKIP_BITS(1); | |
456 pict_type= SHOW_BITS(2); | |
9555 | 457 SKIP_BITS(2 + 7 + 3); |
9543 | 458 } |
9555 | 459 orig_kf= |
460 kf= SHOW_BITS(13); // kf= 2*SHOW_BITS(12); | |
461 // if(pict_type==0) | |
462 if(pict_type<=1){ | |
463 // I frame, sync timestamps: | |
464 priv->kf_base=timestamp-kf; | |
11870 | 465 mp_msg(MSGT_DEMUX, MSGL_V,"\nTS: base=%08X\n",priv->kf_base); |
9555 | 466 kf=timestamp; |
467 } else { | |
468 // P/B frame, merge timestamps: | |
469 int tmp=timestamp-priv->kf_base; | |
470 kf|=tmp&(~0x1fff); // combine with packet timestamp | |
471 if(kf<tmp-4096) kf+=8192; else // workaround wrap-around problems | |
472 if(kf>tmp+4096) kf-=8192; | |
473 kf+=priv->kf_base; | |
474 } | |
9543 | 475 if(pict_type != 3){ // P || I frame -> swap timestamps |
6423 | 476 int tmp=kf; |
477 kf=priv->kf_pts; | |
478 priv->kf_pts=tmp; | |
479 // if(kf<=tmp) kf=0; | |
480 } | |
11870 | 481 mp_msg(MSGT_DEMUX, MSGL_V,"\nTS: %08X -> %08X (%04X) %d %02X %02X %02X %02X %5d\n",timestamp,kf,orig_kf,pict_type,s[0],s[1],s[2],s[3],kf-(int)(1000.0*priv->v_pts)); |
6995
8f92313a0cd5
RV20 A-V desync fixed - use timestamp hack only for RV30
arpi
parents:
6982
diff
changeset
|
482 } |
9555 | 483 #endif |
6423 | 484 v_pts=kf*0.001f; |
9555 | 485 // if(v_pts<priv->v_pts || !kf) v_pts=priv->v_pts+frametime; |
6423 | 486 priv->v_pts=v_pts; |
487 return v_pts; | |
488 } | |
489 | |
7081
66c2e2d0504f
- changed re-muxed packet structure (see struct dp_hdr_t)
arpi
parents:
6995
diff
changeset
|
490 typedef struct dp_hdr_s { |
66c2e2d0504f
- changed re-muxed packet structure (see struct dp_hdr_t)
arpi
parents:
6995
diff
changeset
|
491 uint32_t chunks; // number of chunks |
66c2e2d0504f
- changed re-muxed packet structure (see struct dp_hdr_t)
arpi
parents:
6995
diff
changeset
|
492 uint32_t timestamp; // timestamp from packet header |
66c2e2d0504f
- changed re-muxed packet structure (see struct dp_hdr_t)
arpi
parents:
6995
diff
changeset
|
493 uint32_t len; // length of actual data |
66c2e2d0504f
- changed re-muxed packet structure (see struct dp_hdr_t)
arpi
parents:
6995
diff
changeset
|
494 uint32_t chunktab; // offset to chunk offset array |
66c2e2d0504f
- changed re-muxed packet structure (see struct dp_hdr_t)
arpi
parents:
6995
diff
changeset
|
495 } dp_hdr_t; |
66c2e2d0504f
- changed re-muxed packet structure (see struct dp_hdr_t)
arpi
parents:
6995
diff
changeset
|
496 |
3777 | 497 // return value: |
498 // 0 = EOF or no stream found | |
499 // 1 = successfully read a packet | |
500 int demux_real_fill_buffer(demuxer_t *demuxer) | |
501 { | |
502 real_priv_t *priv = demuxer->priv; | |
503 demux_stream_t *ds = NULL; | |
504 int len; | |
505 int timestamp; | |
506 int stream_id; | |
8254
772d6d27fd66
warning patch by (Dominik Mierzejewski <dominik at rangers dot eu dot org>)
michael
parents:
8123
diff
changeset
|
507 #ifdef CRACK_MATRIX |
3777 | 508 int i; |
8254
772d6d27fd66
warning patch by (Dominik Mierzejewski <dominik at rangers dot eu dot org>)
michael
parents:
8123
diff
changeset
|
509 #endif |
3795 | 510 int flags; |
6916 | 511 int version; |
512 int reserved; | |
11886 | 513 demux_packet_t *dp; |
3777 | 514 |
7710 | 515 while(1){ |
516 | |
6916 | 517 demuxer->filepos = stream_tell(demuxer->stream); |
518 version = stream_read_word(demuxer->stream); /* version */ | |
3777 | 519 len = stream_read_word(demuxer->stream); |
9561
05c462fd6bff
- fixed playback of files with bad WxH in header (tricky! we can always read the
arpi
parents:
9555
diff
changeset
|
520 if ((version==0x4441) && (len==0x5441)) { // new data chunk |
10342 | 521 mp_msg(MSGT_DEMUX,MSGL_INFO,"demux_real: New data chunk is coming!!!\n"); |
9561
05c462fd6bff
- fixed playback of files with bad WxH in header (tricky! we can always read the
arpi
parents:
9555
diff
changeset
|
522 stream_skip(demuxer->stream,14); |
05c462fd6bff
- fixed playback of files with bad WxH in header (tricky! we can always read the
arpi
parents:
9555
diff
changeset
|
523 demuxer->filepos = stream_tell(demuxer->stream); |
05c462fd6bff
- fixed playback of files with bad WxH in header (tricky! we can always read the
arpi
parents:
9555
diff
changeset
|
524 version = stream_read_word(demuxer->stream); /* version */ |
05c462fd6bff
- fixed playback of files with bad WxH in header (tricky! we can always read the
arpi
parents:
9555
diff
changeset
|
525 len = stream_read_word(demuxer->stream); |
12076
1309695bcdf4
Stop reading the file if an INDX chunk is found instead of a data packet.
mosu
parents:
11989
diff
changeset
|
526 } else if ((version == 0x494e) && (len == 0x4458)) { |
1309695bcdf4
Stop reading the file if an INDX chunk is found instead of a data packet.
mosu
parents:
11989
diff
changeset
|
527 mp_msg(MSGT_DEMUX,MSGL_V,"demux_real: Found INDX chunk. EOF.\n"); |
1309695bcdf4
Stop reading the file if an INDX chunk is found instead of a data packet.
mosu
parents:
11989
diff
changeset
|
528 return 0; |
9561
05c462fd6bff
- fixed playback of files with bad WxH in header (tricky! we can always read the
arpi
parents:
9555
diff
changeset
|
529 } |
05c462fd6bff
- fixed playback of files with bad WxH in header (tricky! we can always read the
arpi
parents:
9555
diff
changeset
|
530 |
6916 | 531 |
532 if (len == -256){ /* EOF */ | |
7710 | 533 // printf("len==-256!\n"); |
3777 | 534 return 0; |
6916 | 535 } |
7710 | 536 if (len < 12){ |
11870 | 537 mp_msg(MSGT_DEMUX, MSGL_V,"%08X: packet v%d len=%d \n",(int)demuxer->filepos,(int)version,(int)len); |
538 mp_msg(MSGT_DEMUX, MSGL_WARN,"bad packet len (%d)\n", len); | |
3777 | 539 stream_skip(demuxer->stream, len); |
7710 | 540 continue; //goto loop; |
3777 | 541 } |
7710 | 542 |
3777 | 543 stream_id = stream_read_word(demuxer->stream); |
544 timestamp = stream_read_dword(demuxer->stream); | |
6916 | 545 reserved = stream_read_char(demuxer->stream); |
3795 | 546 flags = stream_read_char(demuxer->stream); |
547 /* flags: */ | |
3985
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
548 /* 0x1 - reliable */ |
3795 | 549 /* 0x2 - keyframe */ |
550 | |
11596
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
551 if (flags & 2) |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
552 add_index_item(demuxer, stream_id, timestamp, demuxer->filepos); |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
553 |
6916 | 554 // printf("%08X: packet v%d len=%4d id=%d pts=%6d rvd=%d flags=%d \n", |
555 // (int)demuxer->filepos,(int)version,(int)len, stream_id, | |
556 // (int) timestamp, reserved, flags); | |
557 | |
6340
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
558 mp_dbg(MSGT_DEMUX,MSGL_DBG2, "len:%d\n", len); |
6916 | 559 mp_dbg(MSGT_DEMUX,MSGL_V, "\npacket#%d: pos: 0x%0x, len: %d, id: %d, pts: %d, flags: %x rvd:%d\n", |
560 priv->current_packet, (int)demuxer->filepos, len, stream_id, timestamp, flags, reserved); | |
3777 | 561 |
3882
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
562 priv->current_packet++; |
3777 | 563 len -= 12; |
564 | |
6344 | 565 // printf("s_id=%d aid=%d vid=%d \n",stream_id,demuxer->audio->id,demuxer->video->id); |
566 | |
7710 | 567 /* check stream_id: */ |
568 | |
569 if(demuxer->audio->id==stream_id){ | |
11441 | 570 if (priv->audio_need_keyframe == 1&& flags != 0x2) |
571 goto discard; | |
8109
cb4c507c69aa
ASF-style stream auto-selection, to fix files with fake a/v streams (only
arpi
parents:
8094
diff
changeset
|
572 got_audio: |
7710 | 573 ds=demuxer->audio; |
574 mp_dbg(MSGT_DEMUX,MSGL_DBG2, "packet is audio (id: %d)\n", stream_id); | |
575 | |
576 // parse audio chunk: | |
3777 | 577 { |
7105 | 578 #ifdef CRACK_MATRIX |
579 int spos=stream_tell(demuxer->stream); | |
580 static int cnt=0; | |
581 static int cnt2=CRACK_MATRIX; | |
582 #endif | |
11877 | 583 if (((sh_audio_t *)ds->sh)->format == mmioFOURCC('M', 'P', '4', 'A')) { |
584 uint16_t *sub_packet_lengths, sub_packets, i; | |
585 /* AAC in Real: several AAC frames in one Real packet. */ | |
586 /* Second byte, upper four bits: number of AAC frames */ | |
587 /* next n * 2 bytes: length of the AAC frames in bytes, BE */ | |
588 sub_packets = (stream_read_word(demuxer->stream) & 0xf0) >> 4; | |
589 sub_packet_lengths = calloc(sub_packets, sizeof(uint16_t)); | |
590 for (i = 0; i < sub_packets; i++) | |
591 sub_packet_lengths[i] = stream_read_word(demuxer->stream); | |
592 for (i = 0; i < sub_packets; i++) { | |
593 demux_packet_t *dp = new_demux_packet(sub_packet_lengths[i]); | |
594 stream_read(demuxer->stream, dp->buffer, sub_packet_lengths[i]); | |
595 dp->pts = (priv->a_pts == timestamp) ? 0 : (timestamp / 1000.0f); | |
596 priv->a_pts = timestamp; | |
597 dp->pos = demuxer->filepos; | |
598 ds_add_packet(ds, dp); | |
599 } | |
600 free(sub_packet_lengths); | |
601 return 1; | |
602 } | |
11886 | 603 dp = new_demux_packet(len); |
6340
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
604 stream_read(demuxer->stream, dp->buffer, len); |
7105 | 605 #ifdef CRACK_MATRIX |
11870 | 606 mp_msg(MSGT_DEMUX, MSGL_V,"*** audio block len=%d\n",len); |
7105 | 607 { // HACK - used for reverse engineering the descrambling matrix |
608 FILE* f=fopen("test.rm","r+"); | |
609 fseek(f,spos,SEEK_SET); | |
610 ++cnt; | |
611 // for(i=0;i<len;i++) dp->buffer[i]=i/0x12; | |
612 // for(i=0;i<len;i++) dp->buffer[i]=i; | |
613 // for(i=0;i<len;i++) dp->buffer[i]=cnt; | |
614 // for(i=0;i<len;i++) dp->buffer[i]=cnt<<4; | |
615 for(i=0;i<len;i++) dp->buffer[i]=(i==cnt2) ? (cnt+16*(8+cnt)) : 0; | |
616 if(cnt==6){ cnt=0; ++cnt2; } | |
617 fwrite(dp->buffer, len, 1, f); | |
618 fclose(f); | |
619 if(cnt2>0x150) *((int*)NULL)=1; // sig11 :) | |
620 } | |
621 #endif | |
10118 | 622 #if 0 |
7710 | 623 if( ((sh_audio_t *)ds->sh)->format == 0x2000) { |
624 // if DNET, swap bytes, as DNET is byte-swapped AC3: | |
4235 | 625 char *ptr = dp->buffer; |
7710 | 626 int i; |
4235 | 627 for (i = 0; i < len; i += 2) |
628 { | |
629 const char tmp = ptr[0]; | |
630 ptr[0] = ptr[1]; | |
631 ptr[1] = tmp; | |
632 ptr += 2; | |
633 } | |
634 } | |
10118 | 635 #endif |
11441 | 636 if (priv->audio_need_keyframe == 1) { |
637 dp->pts = 0; | |
638 priv->audio_need_keyframe = 0; | |
639 }else | |
640 dp->pts = (priv->a_pts==timestamp) ? 0 : (timestamp/1000.0f); | |
6423 | 641 priv->a_pts=timestamp; |
6340
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
642 dp->pos = demuxer->filepos; |
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
643 dp->flags = (flags & 0x2) ? 0x10 : 0; |
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
644 ds_add_packet(ds, dp); |
7710 | 645 } |
11441 | 646 // we will not use audio index if we use -idx and have a video |
11596
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
647 if(!demuxer->video->sh && index_mode == 2 && (unsigned)demuxer->audio->id < MAX_STREAMS) |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
648 while (priv->current_apacket + 1 < priv->index_table_size[demuxer->audio->id] && |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
649 timestamp > priv->index_table[demuxer->audio->id][priv->current_apacket].timestamp) |
11441 | 650 priv->current_apacket += 1; |
7710 | 651 |
652 return 1; | |
653 } | |
654 | |
655 if(demuxer->video->id==stream_id){ | |
8109
cb4c507c69aa
ASF-style stream auto-selection, to fix files with fake a/v streams (only
arpi
parents:
8094
diff
changeset
|
656 got_video: |
7710 | 657 ds=demuxer->video; |
658 mp_dbg(MSGT_DEMUX,MSGL_DBG2, "packet is video (id: %d)\n", stream_id); | |
659 | |
660 // parse video chunk: | |
661 { | |
662 // we need a more complicated, 2nd level demuxing, as the video | |
663 // frames are stored fragmented in the video chunks :( | |
664 sh_video_t *sh_video = ds->sh; | |
665 demux_packet_t *dp; | |
666 int vpkg_header, vpkg_length, vpkg_offset; | |
667 int vpkg_seqnum=-1; | |
668 int vpkg_subseq=0; | |
6340
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
669 |
6916 | 670 while(len>2){ |
7081
66c2e2d0504f
- changed re-muxed packet structure (see struct dp_hdr_t)
arpi
parents:
6995
diff
changeset
|
671 dp_hdr_t* dp_hdr; |
66c2e2d0504f
- changed re-muxed packet structure (see struct dp_hdr_t)
arpi
parents:
6995
diff
changeset
|
672 unsigned char* dp_data; |
66c2e2d0504f
- changed re-muxed packet structure (see struct dp_hdr_t)
arpi
parents:
6995
diff
changeset
|
673 uint32_t* extra; |
6916 | 674 |
675 // printf("xxx len=%d \n",len); | |
6340
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
676 |
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
677 // read packet header |
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
678 // bit 7: 1=last block in block chain |
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
679 // bit 6: 1=short header (only one block?) |
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
680 vpkg_header=stream_read_char(demuxer->stream); --len; |
10735
8a10d5d0ce86
serious bugs - 1l absinth (changed to absinth against cola inflation)
alex
parents:
10508
diff
changeset
|
681 mp_dbg(MSGT_DEMUX,MSGL_DBG2, "hdr: %02X (len=%d) ",vpkg_header,len); |
6340
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
682 |
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
683 if (0x40==(vpkg_header&0xc0)) { |
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
684 // seems to be a very short header |
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
685 // 2 bytes, purpose of the second byte yet unknown |
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
686 int bummer; |
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
687 bummer=stream_read_char(demuxer->stream); --len; |
10735
8a10d5d0ce86
serious bugs - 1l absinth (changed to absinth against cola inflation)
alex
parents:
10508
diff
changeset
|
688 mp_dbg(MSGT_DEMUX,MSGL_DBG2, "%02X",bummer); |
6340
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
689 vpkg_offset=0; |
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
690 vpkg_length=len; |
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
691 } else { |
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
692 |
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
693 if (0==(vpkg_header&0x40)) { |
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
694 // sub-seqnum (bits 0-6: number of fragment. bit 7: ???) |
7081
66c2e2d0504f
- changed re-muxed packet structure (see struct dp_hdr_t)
arpi
parents:
6995
diff
changeset
|
695 vpkg_subseq=stream_read_char(demuxer->stream); |
6340
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
696 --len; |
10735
8a10d5d0ce86
serious bugs - 1l absinth (changed to absinth against cola inflation)
alex
parents:
10508
diff
changeset
|
697 mp_dbg(MSGT_DEMUX,MSGL_DBG2, "subseq: %02X ",vpkg_subseq); |
7081
66c2e2d0504f
- changed re-muxed packet structure (see struct dp_hdr_t)
arpi
parents:
6995
diff
changeset
|
698 vpkg_subseq&=0x7f; |
6340
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
699 } |
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
700 |
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
701 // size of the complete packet |
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
702 // bit 14 is always one (same applies to the offset) |
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
703 vpkg_length=stream_read_word(demuxer->stream); |
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
704 len-=2; |
10735
8a10d5d0ce86
serious bugs - 1l absinth (changed to absinth against cola inflation)
alex
parents:
10508
diff
changeset
|
705 mp_dbg(MSGT_DEMUX,MSGL_DBG2, "l: %02X %02X ",vpkg_length>>8,vpkg_length&0xff); |
6916 | 706 if (!(vpkg_length&0xC000)) { |
707 vpkg_length<<=16; | |
708 vpkg_length|=stream_read_word(demuxer->stream); | |
10735
8a10d5d0ce86
serious bugs - 1l absinth (changed to absinth against cola inflation)
alex
parents:
10508
diff
changeset
|
709 mp_dbg(MSGT_DEMUX,MSGL_DBG2, "l+: %02X %02X ",(vpkg_length>>8)&0xff,vpkg_length&0xff); |
6344 | 710 len-=2; |
711 } else | |
6340
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
712 vpkg_length&=0x3fff; |
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
713 |
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
714 // offset of the following data inside the complete packet |
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
715 // Note: if (hdr&0xC0)==0x80 then offset is relative to the |
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
716 // _end_ of the packet, so it's equal to fragment size!!! |
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
717 vpkg_offset=stream_read_word(demuxer->stream); |
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
718 len-=2; |
10735
8a10d5d0ce86
serious bugs - 1l absinth (changed to absinth against cola inflation)
alex
parents:
10508
diff
changeset
|
719 mp_dbg(MSGT_DEMUX,MSGL_DBG2, "o: %02X %02X ",vpkg_offset>>8,vpkg_offset&0xff); |
6916 | 720 if (!(vpkg_offset&0xC000)) { |
721 vpkg_offset<<=16; | |
722 vpkg_offset|=stream_read_word(demuxer->stream); | |
10735
8a10d5d0ce86
serious bugs - 1l absinth (changed to absinth against cola inflation)
alex
parents:
10508
diff
changeset
|
723 mp_dbg(MSGT_DEMUX,MSGL_DBG2, "o+: %02X %02X ",(vpkg_offset>>8)&0xff,vpkg_offset&0xff); |
6340
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
724 len-=2; |
6344 | 725 } else |
6340
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
726 vpkg_offset&=0x3fff; |
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
727 |
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
728 vpkg_seqnum=stream_read_char(demuxer->stream); --len; |
10735
8a10d5d0ce86
serious bugs - 1l absinth (changed to absinth against cola inflation)
alex
parents:
10508
diff
changeset
|
729 mp_dbg(MSGT_DEMUX,MSGL_DBG2, "seq: %02X ",vpkg_seqnum); |
6340
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
730 } |
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
731 mp_dbg(MSGT_DEMUX,MSGL_DBG2, "\n"); |
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
732 mp_dbg(MSGT_DEMUX,MSGL_DBG2, "blklen=%d\n", len); |
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
733 mp_msg(MSGT_DEMUX,MSGL_DBG2, "block: hdr=0x%0x, len=%d, offset=%d, seqnum=%d\n", |
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
734 vpkg_header, vpkg_length, vpkg_offset, vpkg_seqnum); |
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
735 |
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
736 if(ds->asf_packet){ |
7081
66c2e2d0504f
- changed re-muxed packet structure (see struct dp_hdr_t)
arpi
parents:
6995
diff
changeset
|
737 dp=ds->asf_packet; |
66c2e2d0504f
- changed re-muxed packet structure (see struct dp_hdr_t)
arpi
parents:
6995
diff
changeset
|
738 dp_hdr=(dp_hdr_t*)dp->buffer; |
66c2e2d0504f
- changed re-muxed packet structure (see struct dp_hdr_t)
arpi
parents:
6995
diff
changeset
|
739 dp_data=dp->buffer+sizeof(dp_hdr_t); |
66c2e2d0504f
- changed re-muxed packet structure (see struct dp_hdr_t)
arpi
parents:
6995
diff
changeset
|
740 extra=(uint32_t*)(dp->buffer+dp_hdr->chunktab); |
6340
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
741 mp_dbg(MSGT_DEMUX,MSGL_DBG2, "we have an incomplete packet (oldseq=%d new=%d)\n",ds->asf_seq,vpkg_seqnum); |
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
742 // we have an incomplete packet: |
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
743 if(ds->asf_seq!=vpkg_seqnum){ |
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
744 // this fragment is for new packet, close the old one |
6423 | 745 mp_msg(MSGT_DEMUX,MSGL_DBG2, "closing probably incomplete packet, len: %d \n",dp->len); |
11441 | 746 if(priv->video_after_seek){ |
747 dp->pts=timestamp; | |
748 priv->kf_base = 0; | |
749 priv->kf_pts = dp_hdr->timestamp; | |
750 priv->video_after_seek = 0; | |
751 } else | |
7081
66c2e2d0504f
- changed re-muxed packet structure (see struct dp_hdr_t)
arpi
parents:
6995
diff
changeset
|
752 dp->pts=(dp_hdr->len<3)?0: |
66c2e2d0504f
- changed re-muxed packet structure (see struct dp_hdr_t)
arpi
parents:
6995
diff
changeset
|
753 real_fix_timestamp(priv,dp_data,dp_hdr->timestamp,sh_video->frametime,sh_video->format); |
6423 | 754 ds_add_packet(ds,dp); |
6340
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
755 ds->asf_packet=NULL; |
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
756 } else { |
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
757 // append data to it! |
7081
66c2e2d0504f
- changed re-muxed packet structure (see struct dp_hdr_t)
arpi
parents:
6995
diff
changeset
|
758 ++dp_hdr->chunks; |
66c2e2d0504f
- changed re-muxed packet structure (see struct dp_hdr_t)
arpi
parents:
6995
diff
changeset
|
759 mp_msg(MSGT_DEMUX,MSGL_DBG2,"[chunks=%d subseq=%d]\n",dp_hdr->chunks,vpkg_subseq); |
66c2e2d0504f
- changed re-muxed packet structure (see struct dp_hdr_t)
arpi
parents:
6995
diff
changeset
|
760 if(dp_hdr->chunktab+8*(1+dp_hdr->chunks)>dp->len){ |
66c2e2d0504f
- changed re-muxed packet structure (see struct dp_hdr_t)
arpi
parents:
6995
diff
changeset
|
761 // increase buffer size, this should not happen! |
66c2e2d0504f
- changed re-muxed packet structure (see struct dp_hdr_t)
arpi
parents:
6995
diff
changeset
|
762 mp_msg(MSGT_DEMUX,MSGL_WARN, "chunktab buffer too small!!!!!\n"); |
66c2e2d0504f
- changed re-muxed packet structure (see struct dp_hdr_t)
arpi
parents:
6995
diff
changeset
|
763 dp->len=dp_hdr->chunktab+8*(4+dp_hdr->chunks); |
66c2e2d0504f
- changed re-muxed packet structure (see struct dp_hdr_t)
arpi
parents:
6995
diff
changeset
|
764 dp->buffer=realloc(dp->buffer,dp->len); |
66c2e2d0504f
- changed re-muxed packet structure (see struct dp_hdr_t)
arpi
parents:
6995
diff
changeset
|
765 // re-calc pointers: |
66c2e2d0504f
- changed re-muxed packet structure (see struct dp_hdr_t)
arpi
parents:
6995
diff
changeset
|
766 dp_hdr=(dp_hdr_t*)dp->buffer; |
66c2e2d0504f
- changed re-muxed packet structure (see struct dp_hdr_t)
arpi
parents:
6995
diff
changeset
|
767 dp_data=dp->buffer+sizeof(dp_hdr_t); |
66c2e2d0504f
- changed re-muxed packet structure (see struct dp_hdr_t)
arpi
parents:
6995
diff
changeset
|
768 extra=(uint32_t*)(dp->buffer+dp_hdr->chunktab); |
6340
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
769 } |
7081
66c2e2d0504f
- changed re-muxed packet structure (see struct dp_hdr_t)
arpi
parents:
6995
diff
changeset
|
770 extra[2*dp_hdr->chunks+0]=1; |
66c2e2d0504f
- changed re-muxed packet structure (see struct dp_hdr_t)
arpi
parents:
6995
diff
changeset
|
771 extra[2*dp_hdr->chunks+1]=dp_hdr->len; |
6340
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
772 if(0x80==(vpkg_header&0xc0)){ |
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
773 // last fragment! |
7081
66c2e2d0504f
- changed re-muxed packet structure (see struct dp_hdr_t)
arpi
parents:
6995
diff
changeset
|
774 if(dp_hdr->len!=vpkg_length-vpkg_offset) |
6340
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
775 mp_msg(MSGT_DEMUX,MSGL_V,"warning! assembled.len=%d frag.len=%d total.len=%d \n",dp->len,vpkg_offset,vpkg_length-vpkg_offset); |
7081
66c2e2d0504f
- changed re-muxed packet structure (see struct dp_hdr_t)
arpi
parents:
6995
diff
changeset
|
776 stream_read(demuxer->stream, dp_data+dp_hdr->len, vpkg_offset); |
9553
6886b16ac5d1
Redundant packet ignoring is RV30-only (at least frame-header flag 0x20 is)
arpi
parents:
9543
diff
changeset
|
777 if((dp_data[dp_hdr->len]&0x20) && (sh_video->format==0x30335652)) --dp_hdr->chunks; else |
7081
66c2e2d0504f
- changed re-muxed packet structure (see struct dp_hdr_t)
arpi
parents:
6995
diff
changeset
|
778 dp_hdr->len+=vpkg_offset; |
6340
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
779 len-=vpkg_offset; |
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
780 mp_dbg(MSGT_DEMUX,MSGL_DBG2, "fragment (%d bytes) appended, %d bytes left\n",vpkg_offset,len); |
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
781 // we know that this is the last fragment -> we can close the packet! |
11441 | 782 if(priv->video_after_seek){ |
783 dp->pts=timestamp; | |
784 priv->kf_base = 0; | |
785 priv->kf_pts = dp_hdr->timestamp; | |
786 priv->video_after_seek = 0; | |
787 } else | |
7081
66c2e2d0504f
- changed re-muxed packet structure (see struct dp_hdr_t)
arpi
parents:
6995
diff
changeset
|
788 dp->pts=(dp_hdr->len<3)?0: |
66c2e2d0504f
- changed re-muxed packet structure (see struct dp_hdr_t)
arpi
parents:
6995
diff
changeset
|
789 real_fix_timestamp(priv,dp_data,dp_hdr->timestamp,sh_video->frametime,sh_video->format); |
6340
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
790 ds_add_packet(ds,dp); |
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
791 ds->asf_packet=NULL; |
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
792 // continue parsing |
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
793 continue; |
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
794 } |
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
795 // non-last fragment: |
7081
66c2e2d0504f
- changed re-muxed packet structure (see struct dp_hdr_t)
arpi
parents:
6995
diff
changeset
|
796 if(dp_hdr->len!=vpkg_offset) |
6340
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
797 mp_msg(MSGT_DEMUX,MSGL_V,"warning! assembled.len=%d offset=%d frag.len=%d total.len=%d \n",dp->len,vpkg_offset,len,vpkg_length); |
7081
66c2e2d0504f
- changed re-muxed packet structure (see struct dp_hdr_t)
arpi
parents:
6995
diff
changeset
|
798 stream_read(demuxer->stream, dp_data+dp_hdr->len, len); |
9553
6886b16ac5d1
Redundant packet ignoring is RV30-only (at least frame-header flag 0x20 is)
arpi
parents:
9543
diff
changeset
|
799 if((dp_data[dp_hdr->len]&0x20) && (sh_video->format==0x30335652)) --dp_hdr->chunks; else |
7081
66c2e2d0504f
- changed re-muxed packet structure (see struct dp_hdr_t)
arpi
parents:
6995
diff
changeset
|
800 dp_hdr->len+=len; |
6916 | 801 len=0; |
6340
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
802 break; // no more fragments in this chunk! |
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
803 } |
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
804 } |
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
805 // create new packet! |
7084 | 806 dp = new_demux_packet(sizeof(dp_hdr_t)+vpkg_length+8*(1+2*(vpkg_header&0x3F))); |
6340
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
807 // the timestamp seems to be in milliseconds |
6423 | 808 dp->pts = 0; // timestamp/1000.0f; //timestamp=0; |
6340
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
809 dp->pos = demuxer->filepos; |
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
810 dp->flags = (flags & 0x2) ? 0x10 : 0; |
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
811 ds->asf_seq = vpkg_seqnum; |
7081
66c2e2d0504f
- changed re-muxed packet structure (see struct dp_hdr_t)
arpi
parents:
6995
diff
changeset
|
812 dp_hdr=(dp_hdr_t*)dp->buffer; |
66c2e2d0504f
- changed re-muxed packet structure (see struct dp_hdr_t)
arpi
parents:
6995
diff
changeset
|
813 dp_hdr->chunks=0; |
66c2e2d0504f
- changed re-muxed packet structure (see struct dp_hdr_t)
arpi
parents:
6995
diff
changeset
|
814 dp_hdr->timestamp=timestamp; |
66c2e2d0504f
- changed re-muxed packet structure (see struct dp_hdr_t)
arpi
parents:
6995
diff
changeset
|
815 dp_hdr->chunktab=sizeof(dp_hdr_t)+vpkg_length; |
66c2e2d0504f
- changed re-muxed packet structure (see struct dp_hdr_t)
arpi
parents:
6995
diff
changeset
|
816 dp_data=dp->buffer+sizeof(dp_hdr_t); |
66c2e2d0504f
- changed re-muxed packet structure (see struct dp_hdr_t)
arpi
parents:
6995
diff
changeset
|
817 extra=(uint32_t*)(dp->buffer+dp_hdr->chunktab); |
66c2e2d0504f
- changed re-muxed packet structure (see struct dp_hdr_t)
arpi
parents:
6995
diff
changeset
|
818 extra[0]=1; extra[1]=0; // offset of the first chunk |
6340
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
819 if(0x00==(vpkg_header&0xc0)){ |
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
820 // first fragment: |
7081
66c2e2d0504f
- changed re-muxed packet structure (see struct dp_hdr_t)
arpi
parents:
6995
diff
changeset
|
821 dp_hdr->len=len; |
66c2e2d0504f
- changed re-muxed packet structure (see struct dp_hdr_t)
arpi
parents:
6995
diff
changeset
|
822 stream_read(demuxer->stream, dp_data, len); |
6340
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
823 ds->asf_packet=dp; |
6916 | 824 len=0; |
6340
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
825 break; |
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
826 } |
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
827 // whole packet (not fragmented): |
11870 | 828 if (vpkg_length > len) { |
829 mp_msg(MSGT_DEMUX, MSGL_WARN,"\n******** WARNING: vpkg_length=%i > len=%i ********\n", vpkg_length, len); | |
830 /* | |
831 * To keep the video stream rolling, we need to break | |
832 * here. We shouldn't touch len to make sure rest of the | |
833 * broken packet is skipped. | |
834 */ | |
835 break; | |
836 } | |
7081
66c2e2d0504f
- changed re-muxed packet structure (see struct dp_hdr_t)
arpi
parents:
6995
diff
changeset
|
837 dp_hdr->len=vpkg_length; len-=vpkg_length; |
66c2e2d0504f
- changed re-muxed packet structure (see struct dp_hdr_t)
arpi
parents:
6995
diff
changeset
|
838 stream_read(demuxer->stream, dp_data, vpkg_length); |
11441 | 839 if(priv->video_after_seek){ |
840 dp->pts=timestamp; | |
841 priv->kf_base = 0; | |
842 priv->kf_pts = dp_hdr->timestamp; | |
843 priv->video_after_seek = 0; | |
844 } else | |
7081
66c2e2d0504f
- changed re-muxed packet structure (see struct dp_hdr_t)
arpi
parents:
6995
diff
changeset
|
845 dp->pts=(dp_hdr->len<3)?0: |
66c2e2d0504f
- changed re-muxed packet structure (see struct dp_hdr_t)
arpi
parents:
6995
diff
changeset
|
846 real_fix_timestamp(priv,dp_data,dp_hdr->timestamp,sh_video->frametime,sh_video->format); |
6340
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
847 ds_add_packet(ds,dp); |
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
848 |
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
849 } // while(len>0) |
6916 | 850 |
851 if(len){ | |
11870 | 852 mp_msg(MSGT_DEMUX, MSGL_WARN,"\n******** !!!!!!!! BUG!! len=%d !!!!!!!!!!! ********\n",len); |
6916 | 853 if(len>0) stream_skip(demuxer->stream, len); |
854 } | |
6340
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
855 } |
11596
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
856 if ((unsigned)demuxer->video->id < MAX_STREAMS) |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
857 while (priv->current_vpacket + 1 < priv->index_table_size[demuxer->video->id] && |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
858 timestamp > priv->index_table[demuxer->video->id][priv->current_vpacket + 1].timestamp) |
11441 | 859 priv->current_vpacket += 1; |
7710 | 860 |
861 return 1; | |
4235 | 862 } |
3777 | 863 |
8927 | 864 if(stream_id<256){ |
865 | |
8109
cb4c507c69aa
ASF-style stream auto-selection, to fix files with fake a/v streams (only
arpi
parents:
8094
diff
changeset
|
866 if(demuxer->audio->id==-1 && demuxer->a_streams[stream_id]){ |
cb4c507c69aa
ASF-style stream auto-selection, to fix files with fake a/v streams (only
arpi
parents:
8094
diff
changeset
|
867 sh_audio_t *sh = demuxer->a_streams[stream_id]; |
cb4c507c69aa
ASF-style stream auto-selection, to fix files with fake a/v streams (only
arpi
parents:
8094
diff
changeset
|
868 demuxer->audio->id=stream_id; |
cb4c507c69aa
ASF-style stream auto-selection, to fix files with fake a/v streams (only
arpi
parents:
8094
diff
changeset
|
869 sh->ds=demuxer->audio; |
cb4c507c69aa
ASF-style stream auto-selection, to fix files with fake a/v streams (only
arpi
parents:
8094
diff
changeset
|
870 demuxer->audio->sh=sh; |
cb4c507c69aa
ASF-style stream auto-selection, to fix files with fake a/v streams (only
arpi
parents:
8094
diff
changeset
|
871 mp_msg(MSGT_DEMUX,MSGL_V,"Auto-selected RM audio ID = %d\n",stream_id); |
cb4c507c69aa
ASF-style stream auto-selection, to fix files with fake a/v streams (only
arpi
parents:
8094
diff
changeset
|
872 goto got_audio; |
cb4c507c69aa
ASF-style stream auto-selection, to fix files with fake a/v streams (only
arpi
parents:
8094
diff
changeset
|
873 } |
cb4c507c69aa
ASF-style stream auto-selection, to fix files with fake a/v streams (only
arpi
parents:
8094
diff
changeset
|
874 |
cb4c507c69aa
ASF-style stream auto-selection, to fix files with fake a/v streams (only
arpi
parents:
8094
diff
changeset
|
875 if(demuxer->video->id==-1 && demuxer->v_streams[stream_id]){ |
cb4c507c69aa
ASF-style stream auto-selection, to fix files with fake a/v streams (only
arpi
parents:
8094
diff
changeset
|
876 sh_video_t *sh = demuxer->v_streams[stream_id]; |
cb4c507c69aa
ASF-style stream auto-selection, to fix files with fake a/v streams (only
arpi
parents:
8094
diff
changeset
|
877 demuxer->video->id=stream_id; |
cb4c507c69aa
ASF-style stream auto-selection, to fix files with fake a/v streams (only
arpi
parents:
8094
diff
changeset
|
878 sh->ds=demuxer->video; |
cb4c507c69aa
ASF-style stream auto-selection, to fix files with fake a/v streams (only
arpi
parents:
8094
diff
changeset
|
879 demuxer->video->sh=sh; |
cb4c507c69aa
ASF-style stream auto-selection, to fix files with fake a/v streams (only
arpi
parents:
8094
diff
changeset
|
880 mp_msg(MSGT_DEMUX,MSGL_V,"Auto-selected RM video ID = %d\n",stream_id); |
cb4c507c69aa
ASF-style stream auto-selection, to fix files with fake a/v streams (only
arpi
parents:
8094
diff
changeset
|
881 goto got_video; |
cb4c507c69aa
ASF-style stream auto-selection, to fix files with fake a/v streams (only
arpi
parents:
8094
diff
changeset
|
882 } |
cb4c507c69aa
ASF-style stream auto-selection, to fix files with fake a/v streams (only
arpi
parents:
8094
diff
changeset
|
883 |
8927 | 884 } |
885 | |
7710 | 886 mp_msg(MSGT_DEMUX,MSGL_DBG2, "unknown stream id (%d)\n", stream_id); |
11441 | 887 discard: |
7710 | 888 stream_skip(demuxer->stream, len); |
889 }// goto loop; | |
3777 | 890 } |
891 | |
8123
9fc45fe0d444
*HUGE* set of compiler warning fixes, unused variables removal
arpi
parents:
8113
diff
changeset
|
892 extern void print_wave_header(WAVEFORMATEX *h); |
9fc45fe0d444
*HUGE* set of compiler warning fixes, unused variables removal
arpi
parents:
8113
diff
changeset
|
893 |
3777 | 894 void demux_open_real(demuxer_t* demuxer) |
895 { | |
896 real_priv_t* priv = demuxer->priv; | |
897 int num_of_headers; | |
8109
cb4c507c69aa
ASF-style stream auto-selection, to fix files with fake a/v streams (only
arpi
parents:
8094
diff
changeset
|
898 int a_streams=0; |
cb4c507c69aa
ASF-style stream auto-selection, to fix files with fake a/v streams (only
arpi
parents:
8094
diff
changeset
|
899 int v_streams=0; |
3777 | 900 int i; |
11797
571295c177d2
Fix for Real files with header size == 0x10 (normally is 0x12)
rtognimp
parents:
11606
diff
changeset
|
901 int header_size; |
3777 | 902 |
11797
571295c177d2
Fix for Real files with header size == 0x10 (normally is 0x12)
rtognimp
parents:
11606
diff
changeset
|
903 header_size = stream_read_dword(demuxer->stream); /* header size */ |
571295c177d2
Fix for Real files with header size == 0x10 (normally is 0x12)
rtognimp
parents:
11606
diff
changeset
|
904 mp_msg(MSGT_DEMUX,MSGL_V, "real: Header size: %d\n", header_size); |
571295c177d2
Fix for Real files with header size == 0x10 (normally is 0x12)
rtognimp
parents:
11606
diff
changeset
|
905 i = stream_read_word(demuxer->stream); /* version */ |
571295c177d2
Fix for Real files with header size == 0x10 (normally is 0x12)
rtognimp
parents:
11606
diff
changeset
|
906 mp_msg(MSGT_DEMUX,MSGL_V, "real: Header object version: %d\n", i); |
571295c177d2
Fix for Real files with header size == 0x10 (normally is 0x12)
rtognimp
parents:
11606
diff
changeset
|
907 if (header_size == 0x10) |
571295c177d2
Fix for Real files with header size == 0x10 (normally is 0x12)
rtognimp
parents:
11606
diff
changeset
|
908 i = stream_read_word(demuxer->stream); |
571295c177d2
Fix for Real files with header size == 0x10 (normally is 0x12)
rtognimp
parents:
11606
diff
changeset
|
909 else /* we should test header_size here too. */ |
571295c177d2
Fix for Real files with header size == 0x10 (normally is 0x12)
rtognimp
parents:
11606
diff
changeset
|
910 i = stream_read_dword(demuxer->stream); |
6340
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
911 mp_msg(MSGT_DEMUX,MSGL_V, "real: File version: %d\n", i); |
3777 | 912 num_of_headers = stream_read_dword(demuxer->stream); |
913 // stream_skip(demuxer->stream, 4); /* number of headers */ | |
914 | |
915 /* parse chunks */ | |
10508
e2a88f1d47f6
BBC .rm fix, based on patch by Balatoni Denes <pnis@coder.hu>
arpi
parents:
10368
diff
changeset
|
916 for (i = 1; i <= num_of_headers; i++) |
e2a88f1d47f6
BBC .rm fix, based on patch by Balatoni Denes <pnis@coder.hu>
arpi
parents:
10368
diff
changeset
|
917 // for (i = 1; ; i++) |
3777 | 918 { |
5083
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
919 int chunk_id, chunk_pos, chunk_size; |
3777 | 920 |
5083
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
921 chunk_pos = stream_tell(demuxer->stream); |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
922 chunk_id = stream_read_dword_le(demuxer->stream); |
3777 | 923 chunk_size = stream_read_dword(demuxer->stream); |
924 | |
3985
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
925 stream_skip(demuxer->stream, 2); /* version */ |
7710 | 926 |
6340
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
927 mp_msg(MSGT_DEMUX,MSGL_V, "Chunk: %.4s (%x) (size: 0x%x, offset: 0x%x)\n", |
5083
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
928 (char *)&chunk_id, chunk_id, chunk_size, chunk_pos); |
3777 | 929 |
7710 | 930 if (chunk_size < 10){ |
931 mp_msg(MSGT_DEMUX,MSGL_ERR,"demux_real: invalid chunksize! (%d)\n",chunk_size); | |
8569 | 932 break; //return; |
7710 | 933 } |
934 | |
5083
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
935 switch(chunk_id) |
3777 | 936 { |
937 case MKTAG('P', 'R', 'O', 'P'): | |
3985
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
938 /* Properties header */ |
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
939 |
3777 | 940 stream_skip(demuxer->stream, 4); /* max bitrate */ |
941 stream_skip(demuxer->stream, 4); /* avg bitrate */ | |
942 stream_skip(demuxer->stream, 4); /* max packet size */ | |
943 stream_skip(demuxer->stream, 4); /* avg packet size */ | |
944 stream_skip(demuxer->stream, 4); /* nb packets */ | |
11441 | 945 priv->duration = stream_read_dword(demuxer->stream)/1000; /* duration */ |
946 //stream_skip(demuxer->stream, 4); /* duration */ | |
3777 | 947 stream_skip(demuxer->stream, 4); /* preroll */ |
3882
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
948 priv->index_chunk_offset = stream_read_dword(demuxer->stream); |
6340
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
949 mp_msg(MSGT_DEMUX,MSGL_V,"First index chunk offset: 0x%x\n", priv->index_chunk_offset); |
3795 | 950 priv->data_chunk_offset = stream_read_dword(demuxer->stream)+10; |
6340
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
951 mp_msg(MSGT_DEMUX,MSGL_V,"First data chunk offset: 0x%x\n", priv->data_chunk_offset); |
3777 | 952 stream_skip(demuxer->stream, 2); /* nb streams */ |
3795 | 953 #if 0 |
3777 | 954 stream_skip(demuxer->stream, 2); /* flags */ |
3795 | 955 #else |
956 { | |
957 int flags = stream_read_word(demuxer->stream); | |
5083
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
958 |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
959 if (flags) |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
960 { |
6340
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
961 mp_msg(MSGT_DEMUX,MSGL_V,"Flags (%x): ", flags); |
3795 | 962 if (flags & 0x1) |
6340
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
963 mp_msg(MSGT_DEMUX,MSGL_V,"[save allowed] "); |
3795 | 964 if (flags & 0x2) |
6340
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
965 mp_msg(MSGT_DEMUX,MSGL_V,"[perfect play (more buffers)] "); |
3795 | 966 if (flags & 0x4) |
6340
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
967 mp_msg(MSGT_DEMUX,MSGL_V,"[live broadcast] "); |
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
968 mp_msg(MSGT_DEMUX,MSGL_V,"\n"); |
5083
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
969 } |
3795 | 970 } |
971 #endif | |
3777 | 972 break; |
973 case MKTAG('C', 'O', 'N', 'T'): | |
3788 | 974 { |
3985
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
975 /* Content description header */ |
3788 | 976 char *buf; |
977 int len; | |
978 | |
979 len = stream_read_word(demuxer->stream); | |
980 if (len > 0) | |
981 { | |
982 buf = malloc(len+1); | |
983 stream_read(demuxer->stream, buf, len); | |
5810 | 984 buf[len] = 0; |
3788 | 985 demux_info_add(demuxer, "name", buf); |
986 free(buf); | |
987 } | |
988 | |
989 len = stream_read_word(demuxer->stream); | |
990 if (len > 0) | |
991 { | |
992 buf = malloc(len+1); | |
993 stream_read(demuxer->stream, buf, len); | |
3882
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
994 buf[len] = 0; |
3788 | 995 demux_info_add(demuxer, "author", buf); |
996 free(buf); | |
997 } | |
998 | |
999 len = stream_read_word(demuxer->stream); | |
1000 if (len > 0) | |
1001 { | |
1002 buf = malloc(len+1); | |
1003 stream_read(demuxer->stream, buf, len); | |
3882
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
1004 buf[len] = 0; |
3788 | 1005 demux_info_add(demuxer, "copyright", buf); |
1006 free(buf); | |
1007 } | |
1008 | |
1009 len = stream_read_word(demuxer->stream); | |
1010 if (len > 0) | |
1011 { | |
1012 buf = malloc(len+1); | |
1013 stream_read(demuxer->stream, buf, len); | |
3882
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
1014 buf[len] = 0; |
3788 | 1015 demux_info_add(demuxer, "comment", buf); |
1016 free(buf); | |
1017 } | |
3777 | 1018 break; |
3788 | 1019 } |
3777 | 1020 case MKTAG('M', 'D', 'P', 'R'): |
1021 { | |
3985
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
1022 /* Media properties header */ |
3777 | 1023 int stream_id; |
1024 int bitrate; | |
1025 int codec_data_size; | |
1026 int codec_pos; | |
3795 | 1027 int tmp; |
3777 | 1028 |
1029 stream_id = stream_read_word(demuxer->stream); | |
6340
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
1030 mp_msg(MSGT_DEMUX,MSGL_V,"Found new stream (id: %d)\n", stream_id); |
3777 | 1031 |
1032 stream_skip(demuxer->stream, 4); /* max bitrate */ | |
3985
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
1033 bitrate = stream_read_dword(demuxer->stream); /* avg bitrate */ |
3777 | 1034 stream_skip(demuxer->stream, 4); /* max packet size */ |
1035 stream_skip(demuxer->stream, 4); /* avg packet size */ | |
1036 stream_skip(demuxer->stream, 4); /* start time */ | |
1037 stream_skip(demuxer->stream, 4); /* preroll */ | |
1038 stream_skip(demuxer->stream, 4); /* duration */ | |
1039 | |
3985
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
1040 skip_str(1, demuxer); /* stream description (name) */ |
3777 | 1041 skip_str(1, demuxer); /* mimetype */ |
1042 | |
3985
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
1043 /* Type specific header */ |
3777 | 1044 codec_data_size = stream_read_dword(demuxer->stream); |
1045 codec_pos = stream_tell(demuxer->stream); | |
1046 | |
12992
0945a0a7ed98
do not attempt to seek backward in stream on MDPR chunk with no codec data
reimar
parents:
12665
diff
changeset
|
1047 if (!codec_data_size) { |
0945a0a7ed98
do not attempt to seek backward in stream on MDPR chunk with no codec data
reimar
parents:
12665
diff
changeset
|
1048 mp_msg(MSGT_DEMUX,MSGL_DBG2,"demux_real: no codec data in MDPR chunk at fpos=0x%X\n", codec_pos); |
0945a0a7ed98
do not attempt to seek backward in stream on MDPR chunk with no codec data
reimar
parents:
12665
diff
changeset
|
1049 break; |
0945a0a7ed98
do not attempt to seek backward in stream on MDPR chunk with no codec data
reimar
parents:
12665
diff
changeset
|
1050 } |
0945a0a7ed98
do not attempt to seek backward in stream on MDPR chunk with no codec data
reimar
parents:
12665
diff
changeset
|
1051 |
3795 | 1052 tmp = stream_read_dword(demuxer->stream); |
7085
02aa64b49b70
some files has some shit before teh audio/video headers...
arpi
parents:
7084
diff
changeset
|
1053 |
02aa64b49b70
some files has some shit before teh audio/video headers...
arpi
parents:
7084
diff
changeset
|
1054 mp_msg(MSGT_DEMUX,MSGL_DBG2,"demux_real: type_spec: len=%d fpos=0x%X first_dword=0x%X (%.4s) \n", |
02aa64b49b70
some files has some shit before teh audio/video headers...
arpi
parents:
7084
diff
changeset
|
1055 (int)codec_data_size,(int)codec_pos,tmp,&tmp); |
02aa64b49b70
some files has some shit before teh audio/video headers...
arpi
parents:
7084
diff
changeset
|
1056 |
02aa64b49b70
some files has some shit before teh audio/video headers...
arpi
parents:
7084
diff
changeset
|
1057 #if 1 |
02aa64b49b70
some files has some shit before teh audio/video headers...
arpi
parents:
7084
diff
changeset
|
1058 // skip unknown shit - FIXME: find a better/cleaner way! |
02aa64b49b70
some files has some shit before teh audio/video headers...
arpi
parents:
7084
diff
changeset
|
1059 { int len=codec_data_size; |
02aa64b49b70
some files has some shit before teh audio/video headers...
arpi
parents:
7084
diff
changeset
|
1060 while(--len>=8){ |
02aa64b49b70
some files has some shit before teh audio/video headers...
arpi
parents:
7084
diff
changeset
|
1061 if(tmp==MKTAG(0xfd, 'a', 'r', '.')) break; // audio |
02aa64b49b70
some files has some shit before teh audio/video headers...
arpi
parents:
7084
diff
changeset
|
1062 if(tmp==MKTAG('O', 'D', 'I', 'V')) break; // video |
02aa64b49b70
some files has some shit before teh audio/video headers...
arpi
parents:
7084
diff
changeset
|
1063 tmp=(tmp<<8)|stream_read_char(demuxer->stream); |
02aa64b49b70
some files has some shit before teh audio/video headers...
arpi
parents:
7084
diff
changeset
|
1064 } |
02aa64b49b70
some files has some shit before teh audio/video headers...
arpi
parents:
7084
diff
changeset
|
1065 } |
02aa64b49b70
some files has some shit before teh audio/video headers...
arpi
parents:
7084
diff
changeset
|
1066 #endif |
3985
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
1067 |
7710 | 1068 #ifdef MP_DEBUG |
6374
b2d5aeb72f95
export subpacket-size and matrix w*h to the codec (cook)
arpi
parents:
6369
diff
changeset
|
1069 #define stream_skip(st,siz) { int i; for(i=0;i<siz;i++) mp_msg(MSGT_DEMUX,MSGL_V," %02X",stream_read_char(st)); mp_msg(MSGT_DEMUX,MSGL_V,"\n");} |
7710 | 1070 #endif |
1071 | |
3985
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
1072 if (tmp == MKTAG(0xfd, 'a', 'r', '.')) |
3777 | 1073 { |
3985
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
1074 /* audio header */ |
3777 | 1075 sh_audio_t *sh = new_sh_audio(demuxer, stream_id); |
3795 | 1076 char buf[128]; /* for codec name */ |
1077 int frame_size; | |
6374
b2d5aeb72f95
export subpacket-size and matrix w*h to the codec (cook)
arpi
parents:
6369
diff
changeset
|
1078 int sub_packet_size; |
b2d5aeb72f95
export subpacket-size and matrix w*h to the codec (cook)
arpi
parents:
6369
diff
changeset
|
1079 int sub_packet_h; |
3882
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
1080 int version; |
6369 | 1081 int flavor; |
8094 | 1082 int coded_frame_size; |
1083 int codecdata_length; | |
11989
644d59147048
Support for v3 audio section (used with 14_4 codec) in real files
rtognimp
parents:
11886
diff
changeset
|
1084 int i; |
644d59147048
Support for v3 audio section (used with 14_4 codec) in real files
rtognimp
parents:
11886
diff
changeset
|
1085 char *buft; |
12327
fac1637c2c37
Fix for 28_8 in rm files and header length != 0x4e
rtognimp
parents:
12076
diff
changeset
|
1086 int hdr_size; |
5918
dca3016882cf
completed real seeking - working very well with audio only files
alex
parents:
5810
diff
changeset
|
1087 |
6340
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
1088 mp_msg(MSGT_DEMUX,MSGL_V,"Found audio stream!\n"); |
3882
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
1089 version = stream_read_word(demuxer->stream); |
6340
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
1090 mp_msg(MSGT_DEMUX,MSGL_V,"version: %d\n", version); |
3882
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
1091 // stream_skip(demuxer->stream, 2); /* version (4 or 5) */ |
11989
644d59147048
Support for v3 audio section (used with 14_4 codec) in real files
rtognimp
parents:
11886
diff
changeset
|
1092 if (version == 3) { |
644d59147048
Support for v3 audio section (used with 14_4 codec) in real files
rtognimp
parents:
11886
diff
changeset
|
1093 stream_skip(demuxer->stream, 2); |
644d59147048
Support for v3 audio section (used with 14_4 codec) in real files
rtognimp
parents:
11886
diff
changeset
|
1094 stream_skip(demuxer->stream, 10); |
644d59147048
Support for v3 audio section (used with 14_4 codec) in real files
rtognimp
parents:
11886
diff
changeset
|
1095 stream_skip(demuxer->stream, 4); |
644d59147048
Support for v3 audio section (used with 14_4 codec) in real files
rtognimp
parents:
11886
diff
changeset
|
1096 // Name, author, (c) are also in CONT tag |
644d59147048
Support for v3 audio section (used with 14_4 codec) in real files
rtognimp
parents:
11886
diff
changeset
|
1097 if ((i = stream_read_char(demuxer->stream)) != 0) { |
644d59147048
Support for v3 audio section (used with 14_4 codec) in real files
rtognimp
parents:
11886
diff
changeset
|
1098 buft = malloc(i+1); |
644d59147048
Support for v3 audio section (used with 14_4 codec) in real files
rtognimp
parents:
11886
diff
changeset
|
1099 stream_read(demuxer->stream, buft, i); |
644d59147048
Support for v3 audio section (used with 14_4 codec) in real files
rtognimp
parents:
11886
diff
changeset
|
1100 buft[i] = 0; |
644d59147048
Support for v3 audio section (used with 14_4 codec) in real files
rtognimp
parents:
11886
diff
changeset
|
1101 demux_info_add(demuxer, "Name", buft); |
644d59147048
Support for v3 audio section (used with 14_4 codec) in real files
rtognimp
parents:
11886
diff
changeset
|
1102 free(buft); |
644d59147048
Support for v3 audio section (used with 14_4 codec) in real files
rtognimp
parents:
11886
diff
changeset
|
1103 } |
644d59147048
Support for v3 audio section (used with 14_4 codec) in real files
rtognimp
parents:
11886
diff
changeset
|
1104 if ((i = stream_read_char(demuxer->stream)) != 0) { |
644d59147048
Support for v3 audio section (used with 14_4 codec) in real files
rtognimp
parents:
11886
diff
changeset
|
1105 buft = malloc(i+1); |
644d59147048
Support for v3 audio section (used with 14_4 codec) in real files
rtognimp
parents:
11886
diff
changeset
|
1106 stream_read(demuxer->stream, buft, i); |
644d59147048
Support for v3 audio section (used with 14_4 codec) in real files
rtognimp
parents:
11886
diff
changeset
|
1107 buft[i] = 0; |
644d59147048
Support for v3 audio section (used with 14_4 codec) in real files
rtognimp
parents:
11886
diff
changeset
|
1108 demux_info_add(demuxer, "Author", buft); |
644d59147048
Support for v3 audio section (used with 14_4 codec) in real files
rtognimp
parents:
11886
diff
changeset
|
1109 free(buft); |
644d59147048
Support for v3 audio section (used with 14_4 codec) in real files
rtognimp
parents:
11886
diff
changeset
|
1110 } |
644d59147048
Support for v3 audio section (used with 14_4 codec) in real files
rtognimp
parents:
11886
diff
changeset
|
1111 if ((i = stream_read_char(demuxer->stream)) != 0) { |
644d59147048
Support for v3 audio section (used with 14_4 codec) in real files
rtognimp
parents:
11886
diff
changeset
|
1112 buft = malloc(i+1); |
644d59147048
Support for v3 audio section (used with 14_4 codec) in real files
rtognimp
parents:
11886
diff
changeset
|
1113 stream_read(demuxer->stream, buft, i); |
644d59147048
Support for v3 audio section (used with 14_4 codec) in real files
rtognimp
parents:
11886
diff
changeset
|
1114 buft[i] = 0; |
644d59147048
Support for v3 audio section (used with 14_4 codec) in real files
rtognimp
parents:
11886
diff
changeset
|
1115 demux_info_add(demuxer, "Copyright", buft); |
644d59147048
Support for v3 audio section (used with 14_4 codec) in real files
rtognimp
parents:
11886
diff
changeset
|
1116 free(buft); |
644d59147048
Support for v3 audio section (used with 14_4 codec) in real files
rtognimp
parents:
11886
diff
changeset
|
1117 } |
644d59147048
Support for v3 audio section (used with 14_4 codec) in real files
rtognimp
parents:
11886
diff
changeset
|
1118 if ((i = stream_read_char(demuxer->stream)) != 0) |
644d59147048
Support for v3 audio section (used with 14_4 codec) in real files
rtognimp
parents:
11886
diff
changeset
|
1119 mp_msg(MSGT_DEMUX,MSGL_WARN,"Last header byte is not zero!\n"); |
644d59147048
Support for v3 audio section (used with 14_4 codec) in real files
rtognimp
parents:
11886
diff
changeset
|
1120 stream_skip(demuxer->stream, 1); |
644d59147048
Support for v3 audio section (used with 14_4 codec) in real files
rtognimp
parents:
11886
diff
changeset
|
1121 i = stream_read_char(demuxer->stream); |
644d59147048
Support for v3 audio section (used with 14_4 codec) in real files
rtognimp
parents:
11886
diff
changeset
|
1122 sh->format = stream_read_dword_le(demuxer->stream); |
644d59147048
Support for v3 audio section (used with 14_4 codec) in real files
rtognimp
parents:
11886
diff
changeset
|
1123 if (i != 4) { |
644d59147048
Support for v3 audio section (used with 14_4 codec) in real files
rtognimp
parents:
11886
diff
changeset
|
1124 mp_msg(MSGT_DEMUX,MSGL_WARN,"Audio FourCC size is not 4 (%d), please report to " |
644d59147048
Support for v3 audio section (used with 14_4 codec) in real files
rtognimp
parents:
11886
diff
changeset
|
1125 "MPlayer developers\n", i); |
644d59147048
Support for v3 audio section (used with 14_4 codec) in real files
rtognimp
parents:
11886
diff
changeset
|
1126 stream_skip(demuxer->stream, i - 4); |
644d59147048
Support for v3 audio section (used with 14_4 codec) in real files
rtognimp
parents:
11886
diff
changeset
|
1127 } |
644d59147048
Support for v3 audio section (used with 14_4 codec) in real files
rtognimp
parents:
11886
diff
changeset
|
1128 if (sh->format != mmioFOURCC('l','p','c','J')) { |
644d59147048
Support for v3 audio section (used with 14_4 codec) in real files
rtognimp
parents:
11886
diff
changeset
|
1129 mp_msg(MSGT_DEMUX,MSGL_WARN,"Version 3 audio with FourCC %8x, please report to " |
644d59147048
Support for v3 audio section (used with 14_4 codec) in real files
rtognimp
parents:
11886
diff
changeset
|
1130 "MPlayer developers\n", sh->format); |
644d59147048
Support for v3 audio section (used with 14_4 codec) in real files
rtognimp
parents:
11886
diff
changeset
|
1131 } |
644d59147048
Support for v3 audio section (used with 14_4 codec) in real files
rtognimp
parents:
11886
diff
changeset
|
1132 sh->channels = 1; |
644d59147048
Support for v3 audio section (used with 14_4 codec) in real files
rtognimp
parents:
11886
diff
changeset
|
1133 sh->samplesize = 16; |
644d59147048
Support for v3 audio section (used with 14_4 codec) in real files
rtognimp
parents:
11886
diff
changeset
|
1134 sh->samplerate = 8000; |
644d59147048
Support for v3 audio section (used with 14_4 codec) in real files
rtognimp
parents:
11886
diff
changeset
|
1135 frame_size = 240; |
644d59147048
Support for v3 audio section (used with 14_4 codec) in real files
rtognimp
parents:
11886
diff
changeset
|
1136 strcpy(buf, "14_4"); |
644d59147048
Support for v3 audio section (used with 14_4 codec) in real files
rtognimp
parents:
11886
diff
changeset
|
1137 } else { |
6374
b2d5aeb72f95
export subpacket-size and matrix w*h to the codec (cook)
arpi
parents:
6369
diff
changeset
|
1138 stream_skip(demuxer->stream, 2); // 00 00 |
3788 | 1139 stream_skip(demuxer->stream, 4); /* .ra4 or .ra5 */ |
6374
b2d5aeb72f95
export subpacket-size and matrix w*h to the codec (cook)
arpi
parents:
6369
diff
changeset
|
1140 stream_skip(demuxer->stream, 4); // ??? |
3788 | 1141 stream_skip(demuxer->stream, 2); /* version (4 or 5) */ |
12327
fac1637c2c37
Fix for 28_8 in rm files and header length != 0x4e
rtognimp
parents:
12076
diff
changeset
|
1142 // stream_skip(demuxer->stream, 4); // header size == 0x4E |
fac1637c2c37
Fix for 28_8 in rm files and header length != 0x4e
rtognimp
parents:
12076
diff
changeset
|
1143 hdr_size = stream_read_dword(demuxer->stream); // header size |
fac1637c2c37
Fix for 28_8 in rm files and header length != 0x4e
rtognimp
parents:
12076
diff
changeset
|
1144 mp_msg(MSGT_DEMUX,MSGL_V,"header size: %d\n", hdr_size); |
6369 | 1145 flavor = stream_read_word(demuxer->stream);/* codec flavor id */ |
8094 | 1146 coded_frame_size = stream_read_dword(demuxer->stream);/* needed by codec */ |
1147 //stream_skip(demuxer->stream, 4); /* coded frame size */ | |
6369 | 1148 stream_skip(demuxer->stream, 4); // big number |
1149 stream_skip(demuxer->stream, 4); // bigger number | |
6374
b2d5aeb72f95
export subpacket-size and matrix w*h to the codec (cook)
arpi
parents:
6369
diff
changeset
|
1150 stream_skip(demuxer->stream, 4); // 2 || -''- |
b2d5aeb72f95
export subpacket-size and matrix w*h to the codec (cook)
arpi
parents:
6369
diff
changeset
|
1151 // stream_skip(demuxer->stream, 2); // 0x10 |
b2d5aeb72f95
export subpacket-size and matrix w*h to the codec (cook)
arpi
parents:
6369
diff
changeset
|
1152 sub_packet_h = stream_read_word(demuxer->stream); |
3795 | 1153 // stream_skip(demuxer->stream, 2); /* coded frame size */ |
1154 frame_size = stream_read_word(demuxer->stream); | |
6340
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
1155 mp_msg(MSGT_DEMUX,MSGL_V,"frame_size: %d\n", frame_size); |
6374
b2d5aeb72f95
export subpacket-size and matrix w*h to the codec (cook)
arpi
parents:
6369
diff
changeset
|
1156 sub_packet_size = stream_read_word(demuxer->stream); |
b2d5aeb72f95
export subpacket-size and matrix w*h to the codec (cook)
arpi
parents:
6369
diff
changeset
|
1157 mp_msg(MSGT_DEMUX,MSGL_V,"sub_packet_size: %d\n", sub_packet_size); |
b2d5aeb72f95
export subpacket-size and matrix w*h to the codec (cook)
arpi
parents:
6369
diff
changeset
|
1158 stream_skip(demuxer->stream, 2); // 0 |
3882
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
1159 |
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
1160 if (version == 5) |
6369 | 1161 stream_skip(demuxer->stream, 6); //0,srate,0 |
3777 | 1162 |
1163 sh->samplerate = stream_read_word(demuxer->stream); | |
6369 | 1164 stream_skip(demuxer->stream, 2); // 0 |
1165 sh->samplesize = stream_read_word(demuxer->stream)/8; | |
3777 | 1166 sh->channels = stream_read_word(demuxer->stream); |
6340
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
1167 mp_msg(MSGT_DEMUX,MSGL_V,"samplerate: %d, channels: %d\n", |
3877 | 1168 sh->samplerate, sh->channels); |
3882
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
1169 |
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
1170 if (version == 5) |
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
1171 { |
6369 | 1172 stream_skip(demuxer->stream, 4); // "genr" |
1173 stream_read(demuxer->stream, buf, 4); // fourcc | |
3985
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
1174 buf[4] = 0; |
3882
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
1175 } |
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
1176 else |
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
1177 { |
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
1178 /* Desc #1 */ |
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
1179 skip_str(1, demuxer); |
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
1180 /* Desc #2 */ |
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
1181 get_str(1, demuxer, buf, sizeof(buf)); |
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
1182 } |
11989
644d59147048
Support for v3 audio section (used with 14_4 codec) in real files
rtognimp
parents:
11886
diff
changeset
|
1183 } |
3777 | 1184 |
3985
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
1185 /* Emulate WAVEFORMATEX struct: */ |
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
1186 sh->wf = malloc(sizeof(WAVEFORMATEX)); |
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
1187 memset(sh->wf, 0, sizeof(WAVEFORMATEX)); |
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
1188 sh->wf->nChannels = sh->channels; |
6369 | 1189 sh->wf->wBitsPerSample = sh->samplesize*8; |
3985
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
1190 sh->wf->nSamplesPerSec = sh->samplerate; |
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
1191 sh->wf->nAvgBytesPerSec = bitrate; |
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
1192 sh->wf->nBlockAlign = frame_size; |
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
1193 sh->wf->cbSize = 0; |
6374
b2d5aeb72f95
export subpacket-size and matrix w*h to the codec (cook)
arpi
parents:
6369
diff
changeset
|
1194 sh->format = MKTAG(buf[0], buf[1], buf[2], buf[3]); |
3985
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
1195 |
9472 | 1196 #if 0 |
8094 | 1197 switch (sh->format){ |
1198 case MKTAG('d', 'n', 'e', 't'): | |
1199 mp_msg(MSGT_DEMUX,MSGL_V,"Audio: DNET (AC3 with low-bitrate extension)\n"); | |
1200 break; | |
1201 case MKTAG('s', 'i', 'p', 'r'): | |
1202 mp_msg(MSGT_DEMUX,MSGL_V,"Audio: SiproLab's ACELP.net\n"); | |
1203 break; | |
1204 case MKTAG('c', 'o', 'o', 'k'): | |
1205 mp_msg(MSGT_DEMUX,MSGL_V,"Audio: Real's GeneralCooker (?) (RealAudio G2?) (unsupported)\n"); | |
1206 break; | |
1207 case MKTAG('a', 't', 'r', 'c'): | |
1208 mp_msg(MSGT_DEMUX,MSGL_V,"Audio: Sony ATRAC3 (RealAudio 8) (unsupported)\n"); | |
1209 break; | |
1210 default: | |
1211 mp_msg(MSGT_DEMUX,MSGL_V,"Audio: Unknown (%s)\n", buf); | |
1212 } | |
9472 | 1213 #endif |
8094 | 1214 |
6374
b2d5aeb72f95
export subpacket-size and matrix w*h to the codec (cook)
arpi
parents:
6369
diff
changeset
|
1215 switch (sh->format) |
3795 | 1216 { |
1217 case MKTAG('d', 'n', 'e', 't'): | |
6340
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
1218 mp_msg(MSGT_DEMUX,MSGL_V,"Audio: DNET -> AC3\n"); |
10118 | 1219 // sh->format = 0x2000; |
3795 | 1220 break; |
10032 | 1221 case MKTAG('1', '4', '_', '4'): |
11989
644d59147048
Support for v3 audio section (used with 14_4 codec) in real files
rtognimp
parents:
11886
diff
changeset
|
1222 sh->wf->cbSize = 10; |
644d59147048
Support for v3 audio section (used with 14_4 codec) in real files
rtognimp
parents:
11886
diff
changeset
|
1223 sh->wf = realloc(sh->wf, sizeof(WAVEFORMATEX)+sh->wf->cbSize); |
644d59147048
Support for v3 audio section (used with 14_4 codec) in real files
rtognimp
parents:
11886
diff
changeset
|
1224 ((short*)(sh->wf+1))[0]=0; |
644d59147048
Support for v3 audio section (used with 14_4 codec) in real files
rtognimp
parents:
11886
diff
changeset
|
1225 ((short*)(sh->wf+1))[1]=240; |
644d59147048
Support for v3 audio section (used with 14_4 codec) in real files
rtognimp
parents:
11886
diff
changeset
|
1226 ((short*)(sh->wf+1))[2]=0; |
644d59147048
Support for v3 audio section (used with 14_4 codec) in real files
rtognimp
parents:
11886
diff
changeset
|
1227 ((short*)(sh->wf+1))[3]=0x14; |
644d59147048
Support for v3 audio section (used with 14_4 codec) in real files
rtognimp
parents:
11886
diff
changeset
|
1228 ((short*)(sh->wf+1))[4]=0; |
644d59147048
Support for v3 audio section (used with 14_4 codec) in real files
rtognimp
parents:
11886
diff
changeset
|
1229 break; |
644d59147048
Support for v3 audio section (used with 14_4 codec) in real files
rtognimp
parents:
11886
diff
changeset
|
1230 |
10032 | 1231 case MKTAG('2', '8', '_', '8'): |
12327
fac1637c2c37
Fix for 28_8 in rm files and header length != 0x4e
rtognimp
parents:
12076
diff
changeset
|
1232 sh->wf->cbSize = 10; |
fac1637c2c37
Fix for 28_8 in rm files and header length != 0x4e
rtognimp
parents:
12076
diff
changeset
|
1233 sh->wf = realloc(sh->wf, sizeof(WAVEFORMATEX)+sh->wf->cbSize); |
fac1637c2c37
Fix for 28_8 in rm files and header length != 0x4e
rtognimp
parents:
12076
diff
changeset
|
1234 ((short*)(sh->wf+1))[0]=sub_packet_size; |
fac1637c2c37
Fix for 28_8 in rm files and header length != 0x4e
rtognimp
parents:
12076
diff
changeset
|
1235 ((short*)(sh->wf+1))[1]=sub_packet_h; |
fac1637c2c37
Fix for 28_8 in rm files and header length != 0x4e
rtognimp
parents:
12076
diff
changeset
|
1236 ((short*)(sh->wf+1))[2]=flavor; |
fac1637c2c37
Fix for 28_8 in rm files and header length != 0x4e
rtognimp
parents:
12076
diff
changeset
|
1237 ((short*)(sh->wf+1))[3]=coded_frame_size; |
fac1637c2c37
Fix for 28_8 in rm files and header length != 0x4e
rtognimp
parents:
12076
diff
changeset
|
1238 ((short*)(sh->wf+1))[4]=0; |
fac1637c2c37
Fix for 28_8 in rm files and header length != 0x4e
rtognimp
parents:
12076
diff
changeset
|
1239 break; |
fac1637c2c37
Fix for 28_8 in rm files and header length != 0x4e
rtognimp
parents:
12076
diff
changeset
|
1240 |
3795 | 1241 case MKTAG('s', 'i', 'p', 'r'): |
7105 | 1242 #if 0 |
3788 | 1243 sh->format = 0x130; |
3985
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
1244 /* for buggy directshow loader */ |
6374
b2d5aeb72f95
export subpacket-size and matrix w*h to the codec (cook)
arpi
parents:
6369
diff
changeset
|
1245 sh->wf->cbSize = 4; |
b2d5aeb72f95
export subpacket-size and matrix w*h to the codec (cook)
arpi
parents:
6369
diff
changeset
|
1246 sh->wf = realloc(sh->wf, sizeof(WAVEFORMATEX)+sh->wf->cbSize); |
3985
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
1247 sh->wf->wBitsPerSample = 0; |
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
1248 sh->wf->nAvgBytesPerSec = 1055; |
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
1249 sh->wf->nBlockAlign = 19; |
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
1250 // sh->wf->nBlockAlign = frame_size / 288; |
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
1251 buf[0] = 30; |
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
1252 buf[1] = 1; |
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
1253 buf[2] = 1; |
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
1254 buf[3] = 0; |
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
1255 memcpy((sh->wf+18), (char *)&buf[0], 4); |
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
1256 // sh->wf[sizeof(WAVEFORMATEX)+1] = 30; |
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
1257 // sh->wf[sizeof(WAVEFORMATEX)+2] = 1; |
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
1258 // sh->wf[sizeof(WAVEFORMATEX)+3] = 1; |
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
1259 // sh->wf[sizeof(WAVEFORMATEX)+4] = 0; |
3795 | 1260 break; |
7105 | 1261 #endif |
8094 | 1262 case MKTAG('a', 't', 'r', 'c'): |
1263 #if 0 | |
1264 sh->format = 0x270; | |
1265 /* 14 bytes extra header needed ! */ | |
1266 sh->wf->cbSize = 14; | |
1267 sh->wf = realloc(sh->wf, sizeof(WAVEFORMATEX)+sh->wf->cbSize); | |
1268 sh->wf->nAvgBytesPerSec = 16537; // 8268 | |
1269 sh->wf->nBlockAlign = 384; // 192 | |
1270 sh->wf->wBitsPerSample = 0; /* from AVI created by VirtualDub */ | |
1271 break; | |
1272 #endif | |
3795 | 1273 case MKTAG('c', 'o', 'o', 'k'): |
8094 | 1274 // realaudio codec plugins - common: |
1275 // sh->wf->cbSize = 4+2+24; | |
1276 stream_skip(demuxer->stream,3); // Skip 3 unknown bytes | |
1277 if (version==5) | |
1278 stream_skip(demuxer->stream,1); // Skip 1 additional unknown byte | |
1279 codecdata_length=stream_read_dword(demuxer->stream); | |
1280 sh->wf->cbSize = 10+codecdata_length; | |
6374
b2d5aeb72f95
export subpacket-size and matrix w*h to the codec (cook)
arpi
parents:
6369
diff
changeset
|
1281 sh->wf = realloc(sh->wf, sizeof(WAVEFORMATEX)+sh->wf->cbSize); |
b2d5aeb72f95
export subpacket-size and matrix w*h to the codec (cook)
arpi
parents:
6369
diff
changeset
|
1282 ((short*)(sh->wf+1))[0]=sub_packet_size; |
b2d5aeb72f95
export subpacket-size and matrix w*h to the codec (cook)
arpi
parents:
6369
diff
changeset
|
1283 ((short*)(sh->wf+1))[1]=sub_packet_h; |
b2d5aeb72f95
export subpacket-size and matrix w*h to the codec (cook)
arpi
parents:
6369
diff
changeset
|
1284 ((short*)(sh->wf+1))[2]=flavor; |
8094 | 1285 ((short*)(sh->wf+1))[3]=coded_frame_size; |
1286 ((short*)(sh->wf+1))[4]=codecdata_length; | |
1287 // stream_read(demuxer->stream, ((char*)(sh->wf+1))+6, 24); // extras | |
1288 stream_read(demuxer->stream, ((char*)(sh->wf+1))+10, codecdata_length); // extras | |
3985
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
1289 break; |
11877 | 1290 case MKTAG('r', 'a', 'a', 'c'): |
1291 case MKTAG('r', 'a', 'c', 'p'): | |
1292 /* This is just AAC. The two or five bytes of */ | |
1293 /* config data needed for libfaad are stored */ | |
1294 /* after the audio headers. */ | |
1295 stream_skip(demuxer->stream,3); // Skip 3 unknown bytes | |
1296 if (version==5) | |
1297 stream_skip(demuxer->stream,1); // Skip 1 additional unknown byte | |
1298 codecdata_length=stream_read_dword(demuxer->stream); | |
1299 if (codecdata_length>=1) { | |
1300 sh->codecdata_len = codecdata_length - 1; | |
1301 sh->codecdata = calloc(sh->codecdata_len, 1); | |
1302 stream_skip(demuxer->stream, 1); | |
1303 stream_read(demuxer->stream, sh->codecdata, sh->codecdata_len); | |
1304 } | |
1305 sh->format = mmioFOURCC('M', 'P', '4', 'A'); | |
1306 break; | |
3795 | 1307 default: |
6340
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
1308 mp_msg(MSGT_DEMUX,MSGL_V,"Audio: Unknown (%s)\n", buf); |
3777 | 1309 } |
1310 | |
3985
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
1311 sh->wf->wFormatTag = sh->format; |
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
1312 |
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
1313 print_wave_header(sh->wf); |
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
1314 |
8109
cb4c507c69aa
ASF-style stream auto-selection, to fix files with fake a/v streams (only
arpi
parents:
8094
diff
changeset
|
1315 if(demuxer->audio->id==stream_id){ |
7710 | 1316 demuxer->audio->id=stream_id; |
1317 sh->ds=demuxer->audio; | |
1318 demuxer->audio->sh=sh; | |
3777 | 1319 } |
8109
cb4c507c69aa
ASF-style stream auto-selection, to fix files with fake a/v streams (only
arpi
parents:
8094
diff
changeset
|
1320 |
cb4c507c69aa
ASF-style stream auto-selection, to fix files with fake a/v streams (only
arpi
parents:
8094
diff
changeset
|
1321 ++a_streams; |
cb4c507c69aa
ASF-style stream auto-selection, to fix files with fake a/v streams (only
arpi
parents:
8094
diff
changeset
|
1322 |
7710 | 1323 #ifdef stream_skip |
6369 | 1324 #undef stream_skip |
7710 | 1325 #endif |
3777 | 1326 } |
1327 else | |
3985
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
1328 // case MKTAG('V', 'I', 'D', 'O'): |
7085
02aa64b49b70
some files has some shit before teh audio/video headers...
arpi
parents:
7084
diff
changeset
|
1329 if(tmp == MKTAG('O', 'D', 'I', 'V')) |
3777 | 1330 { |
1331 /* video header */ | |
1332 sh_video_t *sh = new_sh_video(demuxer, stream_id); | |
1333 | |
1334 sh->format = stream_read_dword_le(demuxer->stream); /* fourcc */ | |
6340
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
1335 mp_msg(MSGT_DEMUX,MSGL_V,"video fourcc: %.4s (%x)\n", (char *)&sh->format, sh->format); |
3777 | 1336 |
3795 | 1337 /* emulate BITMAPINFOHEADER */ |
9561
05c462fd6bff
- fixed playback of files with bad WxH in header (tricky! we can always read the
arpi
parents:
9555
diff
changeset
|
1338 sh->bih = malloc(sizeof(BITMAPINFOHEADER)+12); |
05c462fd6bff
- fixed playback of files with bad WxH in header (tricky! we can always read the
arpi
parents:
9555
diff
changeset
|
1339 memset(sh->bih, 0, sizeof(BITMAPINFOHEADER)+12); |
6344 | 1340 sh->bih->biSize = 48; |
3777 | 1341 sh->disp_w = sh->bih->biWidth = stream_read_word(demuxer->stream); |
1342 sh->disp_h = sh->bih->biHeight = stream_read_word(demuxer->stream); | |
1343 sh->bih->biPlanes = 1; | |
1344 sh->bih->biBitCount = 24; | |
1345 sh->bih->biCompression = sh->format; | |
1346 sh->bih->biSizeImage= sh->bih->biWidth*sh->bih->biHeight*3; | |
1347 | |
9561
05c462fd6bff
- fixed playback of files with bad WxH in header (tricky! we can always read the
arpi
parents:
9555
diff
changeset
|
1348 sh->fps = (float) stream_read_word(demuxer->stream); |
05c462fd6bff
- fixed playback of files with bad WxH in header (tricky! we can always read the
arpi
parents:
9555
diff
changeset
|
1349 if (sh->fps<=0) sh->fps=24; // we probably won't even care about fps |
3777 | 1350 sh->frametime = 1.0f/sh->fps; |
1351 | |
6344 | 1352 #if 1 |
6414
67c1050a8718
fix fps/frametime parsing - patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
6404
diff
changeset
|
1353 stream_skip(demuxer->stream, 4); |
6344 | 1354 #else |
11870 | 1355 mp_msg(MSGT_DEMUX, MSGL_V,"unknown1: 0x%X \n",stream_read_dword(demuxer->stream)); |
1356 mp_msg(MSGT_DEMUX, MSGL_V,"unknown2: 0x%X \n",stream_read_word(demuxer->stream)); | |
1357 mp_msg(MSGT_DEMUX, MSGL_V,"unknown3: 0x%X \n",stream_read_word(demuxer->stream)); | |
6344 | 1358 #endif |
9561
05c462fd6bff
- fixed playback of files with bad WxH in header (tricky! we can always read the
arpi
parents:
9555
diff
changeset
|
1359 // if(sh->format==0x30335652 || sh->format==0x30325652 ) |
05c462fd6bff
- fixed playback of files with bad WxH in header (tricky! we can always read the
arpi
parents:
9555
diff
changeset
|
1360 if(1) |
05c462fd6bff
- fixed playback of files with bad WxH in header (tricky! we can always read the
arpi
parents:
9555
diff
changeset
|
1361 { |
05c462fd6bff
- fixed playback of files with bad WxH in header (tricky! we can always read the
arpi
parents:
9555
diff
changeset
|
1362 int tmp=stream_read_word(demuxer->stream); |
05c462fd6bff
- fixed playback of files with bad WxH in header (tricky! we can always read the
arpi
parents:
9555
diff
changeset
|
1363 if(tmp>0){ |
05c462fd6bff
- fixed playback of files with bad WxH in header (tricky! we can always read the
arpi
parents:
9555
diff
changeset
|
1364 sh->fps=tmp; sh->frametime = 1.0f/sh->fps; |
05c462fd6bff
- fixed playback of files with bad WxH in header (tricky! we can always read the
arpi
parents:
9555
diff
changeset
|
1365 } |
6414
67c1050a8718
fix fps/frametime parsing - patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
6404
diff
changeset
|
1366 } else { |
7710 | 1367 int fps=stream_read_word(demuxer->stream); |
11870 | 1368 mp_msg(MSGT_DEMUX, MSGL_WARN,"realvid: ignoring FPS = %d\n",fps); |
6414
67c1050a8718
fix fps/frametime parsing - patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
6404
diff
changeset
|
1369 } |
67c1050a8718
fix fps/frametime parsing - patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
6404
diff
changeset
|
1370 stream_skip(demuxer->stream, 2); |
6344 | 1371 |
1372 // read codec sub-format (to make difference between low and high rate codec) | |
1373 ((unsigned int*)(sh->bih+1))[0]=stream_read_dword(demuxer->stream); | |
3777 | 1374 |
1375 /* h263 hack */ | |
3795 | 1376 tmp = stream_read_dword(demuxer->stream); |
6344 | 1377 ((unsigned int*)(sh->bih+1))[1]=tmp; |
6340
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
1378 mp_msg(MSGT_DEMUX,MSGL_V,"H.263 ID: %x\n", tmp); |
3795 | 1379 switch (tmp) |
3777 | 1380 { |
1381 case 0x10000000: | |
1382 /* sub id: 0 */ | |
1383 /* codec id: rv10 */ | |
1384 break; | |
1385 case 0x10003000: | |
1386 case 0x10003001: | |
1387 /* sub id: 3 */ | |
1388 /* codec id: rv10 */ | |
3877 | 1389 sh->bih->biCompression = sh->format = mmioFOURCC('R', 'V', '1', '3'); |
3777 | 1390 break; |
1391 case 0x20001000: | |
3788 | 1392 case 0x20100001: |
7084 | 1393 case 0x20200002: |
3777 | 1394 /* codec id: rv20 */ |
1395 break; | |
6340
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
1396 case 0x30202002: |
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
1397 /* codec id: rv30 */ |
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
1398 break; |
6982 | 1399 case 0x40000000: |
1400 /* codec id: rv40 */ | |
1401 break; | |
3777 | 1402 default: |
1403 /* codec id: none */ | |
6340
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
1404 mp_msg(MSGT_DEMUX,MSGL_V,"unknown id: %x\n", tmp); |
3777 | 1405 } |
9561
05c462fd6bff
- fixed playback of files with bad WxH in header (tricky! we can always read the
arpi
parents:
9555
diff
changeset
|
1406 |
05c462fd6bff
- fixed playback of files with bad WxH in header (tricky! we can always read the
arpi
parents:
9555
diff
changeset
|
1407 if((sh->format<=0x30335652) && (tmp>=0x20200002)){ |
05c462fd6bff
- fixed playback of files with bad WxH in header (tricky! we can always read the
arpi
parents:
9555
diff
changeset
|
1408 // read secondary WxH for the cmsg24[] (see vd_realvid.c) |
05c462fd6bff
- fixed playback of files with bad WxH in header (tricky! we can always read the
arpi
parents:
9555
diff
changeset
|
1409 ((unsigned short*)(sh->bih+1))[4]=4*(unsigned short)stream_read_char(demuxer->stream); //widht |
05c462fd6bff
- fixed playback of files with bad WxH in header (tricky! we can always read the
arpi
parents:
9555
diff
changeset
|
1410 ((unsigned short*)(sh->bih+1))[5]=4*(unsigned short)stream_read_char(demuxer->stream); //height |
05c462fd6bff
- fixed playback of files with bad WxH in header (tricky! we can always read the
arpi
parents:
9555
diff
changeset
|
1411 } |
7710 | 1412 |
8109
cb4c507c69aa
ASF-style stream auto-selection, to fix files with fake a/v streams (only
arpi
parents:
8094
diff
changeset
|
1413 if(demuxer->video->id==stream_id){ |
7710 | 1414 demuxer->video->id=stream_id; |
1415 sh->ds=demuxer->video; | |
1416 demuxer->video->sh=sh; | |
3777 | 1417 } |
8109
cb4c507c69aa
ASF-style stream auto-selection, to fix files with fake a/v streams (only
arpi
parents:
8094
diff
changeset
|
1418 |
cb4c507c69aa
ASF-style stream auto-selection, to fix files with fake a/v streams (only
arpi
parents:
8094
diff
changeset
|
1419 ++v_streams; |
7710 | 1420 |
3777 | 1421 } |
7085
02aa64b49b70
some files has some shit before teh audio/video headers...
arpi
parents:
7084
diff
changeset
|
1422 else { |
02aa64b49b70
some files has some shit before teh audio/video headers...
arpi
parents:
7084
diff
changeset
|
1423 mp_msg(MSGT_DEMUX, MSGL_ERR, "Not audio/video stream or unsupported!\n"); |
02aa64b49b70
some files has some shit before teh audio/video headers...
arpi
parents:
7084
diff
changeset
|
1424 } |
3985
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
1425 // break; |
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
1426 // default: |
7472
c4434bdf6e51
tons of warning fixes, also some 10l bugfixes, including Dominik's PVA bug
arpi
parents:
7105
diff
changeset
|
1427 //skip_this_chunk: |
3777 | 1428 /* skip codec info */ |
3795 | 1429 tmp = stream_tell(demuxer->stream) - codec_pos; |
6344 | 1430 mp_msg(MSGT_DEMUX,MSGL_V,"### skipping %d bytes of codec info\n", codec_data_size - tmp); |
1431 #if 0 | |
1432 { int i; | |
1433 for(i=0;i<codec_data_size - tmp;i++) | |
11870 | 1434 mp_msg(MSGT_DEMUX, MSGL_V," %02X",stream_read_char(demuxer->stream)); |
1435 mp_msg(MSGT_DEMUX, MSGL_V,"\n"); | |
6344 | 1436 } |
1437 #else | |
3795 | 1438 stream_skip(demuxer->stream, codec_data_size - tmp); |
6344 | 1439 #endif |
3777 | 1440 break; |
3985
701d18898835
updated/extended some parts, based on RMFF (also initial ATRAC3 hackings and notes)
alex
parents:
3882
diff
changeset
|
1441 // } |
3777 | 1442 } |
1443 case MKTAG('D', 'A', 'T', 'A'): | |
1444 goto header_end; | |
3795 | 1445 case MKTAG('I', 'N', 'D', 'X'): |
3777 | 1446 default: |
6340
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
1447 mp_msg(MSGT_DEMUX,MSGL_V,"Unknown chunk: %x\n", chunk_id); |
3777 | 1448 stream_skip(demuxer->stream, chunk_size - 10); |
1449 break; | |
1450 } | |
1451 } | |
1452 | |
1453 header_end: | |
10508
e2a88f1d47f6
BBC .rm fix, based on patch by Balatoni Denes <pnis@coder.hu>
arpi
parents:
10368
diff
changeset
|
1454 // printf("i=%d num_of_headers=%d \n",i,num_of_headers); |
3777 | 1455 priv->num_of_packets = stream_read_dword(demuxer->stream); |
1456 // stream_skip(demuxer->stream, 4); /* number of packets */ | |
1457 stream_skip(demuxer->stream, 4); /* next data header */ | |
1458 | |
6340
7f612cf06ba5
sub-packet demuxer for rv20/rv30, patch by Florian Schneider <flo-mplayer-dev@gmx.net>
arpi
parents:
5918
diff
changeset
|
1459 mp_msg(MSGT_DEMUX,MSGL_V,"Packets in file: %d\n", priv->num_of_packets); |
3777 | 1460 |
3882
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
1461 if (priv->num_of_packets == 0) |
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
1462 priv->num_of_packets = -10; |
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
1463 |
3777 | 1464 |
11441 | 1465 priv->audio_need_keyframe = 0; |
1466 priv->video_after_seek = 0; | |
1467 | |
12665
751a27fc8895
index creation/reading behaviour just like the avi demuxer, patch based on work by Reza Jelveh, Moritz Bunkus und myself
alex
parents:
12367
diff
changeset
|
1468 switch (index_mode){ |
751a27fc8895
index creation/reading behaviour just like the avi demuxer, patch based on work by Reza Jelveh, Moritz Bunkus und myself
alex
parents:
12367
diff
changeset
|
1469 case -1: // untouched |
751a27fc8895
index creation/reading behaviour just like the avi demuxer, patch based on work by Reza Jelveh, Moritz Bunkus und myself
alex
parents:
12367
diff
changeset
|
1470 if (priv->index_chunk_offset && (priv->index_chunk_offset < demuxer->movi_end)) |
751a27fc8895
index creation/reading behaviour just like the avi demuxer, patch based on work by Reza Jelveh, Moritz Bunkus und myself
alex
parents:
12367
diff
changeset
|
1471 { |
751a27fc8895
index creation/reading behaviour just like the avi demuxer, patch based on work by Reza Jelveh, Moritz Bunkus und myself
alex
parents:
12367
diff
changeset
|
1472 parse_index_chunk(demuxer); |
751a27fc8895
index creation/reading behaviour just like the avi demuxer, patch based on work by Reza Jelveh, Moritz Bunkus und myself
alex
parents:
12367
diff
changeset
|
1473 demuxer->seekable = 1; |
751a27fc8895
index creation/reading behaviour just like the avi demuxer, patch based on work by Reza Jelveh, Moritz Bunkus und myself
alex
parents:
12367
diff
changeset
|
1474 } |
751a27fc8895
index creation/reading behaviour just like the avi demuxer, patch based on work by Reza Jelveh, Moritz Bunkus und myself
alex
parents:
12367
diff
changeset
|
1475 break; |
751a27fc8895
index creation/reading behaviour just like the avi demuxer, patch based on work by Reza Jelveh, Moritz Bunkus und myself
alex
parents:
12367
diff
changeset
|
1476 case 1: // use (generate index) |
751a27fc8895
index creation/reading behaviour just like the avi demuxer, patch based on work by Reza Jelveh, Moritz Bunkus und myself
alex
parents:
12367
diff
changeset
|
1477 if (priv->index_chunk_offset && (priv->index_chunk_offset < demuxer->movi_end)) |
751a27fc8895
index creation/reading behaviour just like the avi demuxer, patch based on work by Reza Jelveh, Moritz Bunkus und myself
alex
parents:
12367
diff
changeset
|
1478 { |
751a27fc8895
index creation/reading behaviour just like the avi demuxer, patch based on work by Reza Jelveh, Moritz Bunkus und myself
alex
parents:
12367
diff
changeset
|
1479 parse_index_chunk(demuxer); |
751a27fc8895
index creation/reading behaviour just like the avi demuxer, patch based on work by Reza Jelveh, Moritz Bunkus und myself
alex
parents:
12367
diff
changeset
|
1480 demuxer->seekable = 1; |
751a27fc8895
index creation/reading behaviour just like the avi demuxer, patch based on work by Reza Jelveh, Moritz Bunkus und myself
alex
parents:
12367
diff
changeset
|
1481 } else { |
751a27fc8895
index creation/reading behaviour just like the avi demuxer, patch based on work by Reza Jelveh, Moritz Bunkus und myself
alex
parents:
12367
diff
changeset
|
1482 generate_index(demuxer); |
751a27fc8895
index creation/reading behaviour just like the avi demuxer, patch based on work by Reza Jelveh, Moritz Bunkus und myself
alex
parents:
12367
diff
changeset
|
1483 demuxer->seekable = 1; |
751a27fc8895
index creation/reading behaviour just like the avi demuxer, patch based on work by Reza Jelveh, Moritz Bunkus und myself
alex
parents:
12367
diff
changeset
|
1484 } |
751a27fc8895
index creation/reading behaviour just like the avi demuxer, patch based on work by Reza Jelveh, Moritz Bunkus und myself
alex
parents:
12367
diff
changeset
|
1485 break; |
751a27fc8895
index creation/reading behaviour just like the avi demuxer, patch based on work by Reza Jelveh, Moritz Bunkus und myself
alex
parents:
12367
diff
changeset
|
1486 case 2: // force generating index |
751a27fc8895
index creation/reading behaviour just like the avi demuxer, patch based on work by Reza Jelveh, Moritz Bunkus und myself
alex
parents:
12367
diff
changeset
|
1487 generate_index(demuxer); |
751a27fc8895
index creation/reading behaviour just like the avi demuxer, patch based on work by Reza Jelveh, Moritz Bunkus und myself
alex
parents:
12367
diff
changeset
|
1488 demuxer->seekable = 1; |
751a27fc8895
index creation/reading behaviour just like the avi demuxer, patch based on work by Reza Jelveh, Moritz Bunkus und myself
alex
parents:
12367
diff
changeset
|
1489 break; |
751a27fc8895
index creation/reading behaviour just like the avi demuxer, patch based on work by Reza Jelveh, Moritz Bunkus und myself
alex
parents:
12367
diff
changeset
|
1490 default: // do nothing |
751a27fc8895
index creation/reading behaviour just like the avi demuxer, patch based on work by Reza Jelveh, Moritz Bunkus und myself
alex
parents:
12367
diff
changeset
|
1491 break; |
751a27fc8895
index creation/reading behaviour just like the avi demuxer, patch based on work by Reza Jelveh, Moritz Bunkus und myself
alex
parents:
12367
diff
changeset
|
1492 } |
3882
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
1493 |
8109
cb4c507c69aa
ASF-style stream auto-selection, to fix files with fake a/v streams (only
arpi
parents:
8094
diff
changeset
|
1494 // detect streams: |
cb4c507c69aa
ASF-style stream auto-selection, to fix files with fake a/v streams (only
arpi
parents:
8094
diff
changeset
|
1495 if(demuxer->video->id==-1 && v_streams>0){ |
cb4c507c69aa
ASF-style stream auto-selection, to fix files with fake a/v streams (only
arpi
parents:
8094
diff
changeset
|
1496 // find the valid video stream: |
cb4c507c69aa
ASF-style stream auto-selection, to fix files with fake a/v streams (only
arpi
parents:
8094
diff
changeset
|
1497 if(!ds_fill_buffer(demuxer->video)){ |
cb4c507c69aa
ASF-style stream auto-selection, to fix files with fake a/v streams (only
arpi
parents:
8094
diff
changeset
|
1498 mp_msg(MSGT_DEMUXER,MSGL_INFO,"RM: " MSGTR_MissingVideoStream); |
cb4c507c69aa
ASF-style stream auto-selection, to fix files with fake a/v streams (only
arpi
parents:
8094
diff
changeset
|
1499 } |
cb4c507c69aa
ASF-style stream auto-selection, to fix files with fake a/v streams (only
arpi
parents:
8094
diff
changeset
|
1500 } |
cb4c507c69aa
ASF-style stream auto-selection, to fix files with fake a/v streams (only
arpi
parents:
8094
diff
changeset
|
1501 if(demuxer->audio->id==-1 && a_streams>0){ |
cb4c507c69aa
ASF-style stream auto-selection, to fix files with fake a/v streams (only
arpi
parents:
8094
diff
changeset
|
1502 // find the valid audio stream: |
cb4c507c69aa
ASF-style stream auto-selection, to fix files with fake a/v streams (only
arpi
parents:
8094
diff
changeset
|
1503 if(!ds_fill_buffer(demuxer->audio)){ |
cb4c507c69aa
ASF-style stream auto-selection, to fix files with fake a/v streams (only
arpi
parents:
8094
diff
changeset
|
1504 mp_msg(MSGT_DEMUXER,MSGL_INFO,"RM: " MSGTR_MissingAudioStream); |
cb4c507c69aa
ASF-style stream auto-selection, to fix files with fake a/v streams (only
arpi
parents:
8094
diff
changeset
|
1505 } |
cb4c507c69aa
ASF-style stream auto-selection, to fix files with fake a/v streams (only
arpi
parents:
8094
diff
changeset
|
1506 } |
cb4c507c69aa
ASF-style stream auto-selection, to fix files with fake a/v streams (only
arpi
parents:
8094
diff
changeset
|
1507 |
9561
05c462fd6bff
- fixed playback of files with bad WxH in header (tricky! we can always read the
arpi
parents:
9555
diff
changeset
|
1508 if(demuxer->video->sh){ |
05c462fd6bff
- fixed playback of files with bad WxH in header (tricky! we can always read the
arpi
parents:
9555
diff
changeset
|
1509 sh_video_t *sh=demuxer->video->sh; |
05c462fd6bff
- fixed playback of files with bad WxH in header (tricky! we can always read the
arpi
parents:
9555
diff
changeset
|
1510 mp_msg(MSGT_DEMUX,MSGL_INFO,"VIDEO: %.4s [%08X,%08X] %dx%d (aspect %4.2f) %4.2f fps\n", |
11606 | 1511 &sh->format,((unsigned int*)(sh->bih+1))[1],((unsigned int*)(sh->bih+1))[0], |
9561
05c462fd6bff
- fixed playback of files with bad WxH in header (tricky! we can always read the
arpi
parents:
9555
diff
changeset
|
1512 sh->disp_w,sh->disp_h,sh->aspect,sh->fps); |
05c462fd6bff
- fixed playback of files with bad WxH in header (tricky! we can always read the
arpi
parents:
9555
diff
changeset
|
1513 } |
05c462fd6bff
- fixed playback of files with bad WxH in header (tricky! we can always read the
arpi
parents:
9555
diff
changeset
|
1514 |
3777 | 1515 } |
1516 | |
1517 void demux_close_real(demuxer_t *demuxer) | |
1518 { | |
1519 real_priv_t* priv = demuxer->priv; | |
1520 | |
1521 if (priv) | |
1522 free(priv); | |
1523 | |
1524 return; | |
1525 } | |
3882
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
1526 |
11441 | 1527 extern void resync_audio_stream(sh_audio_t * sh_audio); |
1528 | |
5918
dca3016882cf
completed real seeking - working very well with audio only files
alex
parents:
5810
diff
changeset
|
1529 /* please upload RV10 samples WITH INDEX CHUNK */ |
3882
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
1530 int demux_seek_real(demuxer_t *demuxer, float rel_seek_secs, int flags) |
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
1531 { |
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
1532 real_priv_t *priv = demuxer->priv; |
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
1533 demux_stream_t *d_audio = demuxer->audio; |
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
1534 demux_stream_t *d_video = demuxer->video; |
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
1535 sh_audio_t *sh_audio = d_audio->sh; |
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
1536 sh_video_t *sh_video = d_video->sh; |
6344 | 1537 int vid = d_video->id, aid = d_audio->id; |
6404
83b3315c679b
Implement Nilmoni's and Bernd Ernesti's patches for:
atmos4
parents:
6374
diff
changeset
|
1538 int next_offset = 0; |
11441 | 1539 int cur_timestamp = 0; |
5918
dca3016882cf
completed real seeking - working very well with audio only files
alex
parents:
5810
diff
changeset
|
1540 int streams = 0; |
11596
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
1541 int retried = 0; |
5083
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
1542 |
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
1543 |
11596
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
1544 if (sh_video && (unsigned)vid < MAX_STREAMS && priv->index_table_size[vid]) |
5918
dca3016882cf
completed real seeking - working very well with audio only files
alex
parents:
5810
diff
changeset
|
1545 streams |= 1; |
11596
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
1546 if (sh_audio && (unsigned)aid < MAX_STREAMS && priv->index_table_size[aid]) |
5918
dca3016882cf
completed real seeking - working very well with audio only files
alex
parents:
5810
diff
changeset
|
1547 streams |= 2; |
dca3016882cf
completed real seeking - working very well with audio only files
alex
parents:
5810
diff
changeset
|
1548 |
dca3016882cf
completed real seeking - working very well with audio only files
alex
parents:
5810
diff
changeset
|
1549 // printf("streams: %d\n", streams); |
dca3016882cf
completed real seeking - working very well with audio only files
alex
parents:
5810
diff
changeset
|
1550 |
dca3016882cf
completed real seeking - working very well with audio only files
alex
parents:
5810
diff
changeset
|
1551 if (!streams) |
dca3016882cf
completed real seeking - working very well with audio only files
alex
parents:
5810
diff
changeset
|
1552 return 0; |
dca3016882cf
completed real seeking - working very well with audio only files
alex
parents:
5810
diff
changeset
|
1553 |
3882
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
1554 if (flags & 1) |
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
1555 /* seek absolute */ |
5083
ce6952225939
added PRE-ALPHA seeking ability and index table generator (like avi's one)
alex
parents:
4328
diff
changeset
|
1556 priv->current_apacket = priv->current_vpacket = 0; |
3882
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
1557 |
11596
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
1558 if ((streams & 1) && priv->current_vpacket >= priv->index_table_size[vid]) |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
1559 priv->current_vpacket = priv->index_table_size[vid] - 1; |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
1560 if ((streams & 2) && priv->current_apacket >= priv->index_table_size[aid]) |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
1561 priv->current_apacket = priv->index_table_size[aid] - 1; |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
1562 |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
1563 // if (index_mode == 1 || index_mode == 2) { |
11441 | 1564 if (streams & 1) {// use the video index if we have one |
1565 cur_timestamp = priv->index_table[vid][priv->current_vpacket].timestamp; | |
1566 if (rel_seek_secs > 0) | |
1567 while ((priv->index_table[vid][priv->current_vpacket].timestamp - cur_timestamp) < rel_seek_secs * 1000){ | |
1568 priv->current_vpacket += 1; | |
1569 if (priv->current_vpacket >= priv->index_table_size[vid]) { | |
1570 priv->current_vpacket = priv->index_table_size[vid] - 1; | |
11596
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
1571 if (!retried) { |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
1572 stream_seek(demuxer->stream, priv->index_table[vid][priv->current_vpacket].offset); |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
1573 add_index_segment(demuxer, vid, cur_timestamp + rel_seek_secs * 1000); |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
1574 retried = 1; |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
1575 } |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
1576 else |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
1577 break; |
11441 | 1578 } |
1579 } | |
1580 else if (rel_seek_secs < 0) | |
1581 while ((cur_timestamp - priv->index_table[vid][priv->current_vpacket].timestamp) < - rel_seek_secs * 1000){ | |
1582 priv->current_vpacket -= 1; | |
1583 if (priv->current_vpacket < 0) { | |
1584 priv->current_vpacket = 0; | |
1585 break; | |
1586 } | |
1587 } | |
1588 next_offset = priv->index_table[vid][priv->current_vpacket].offset; | |
1589 priv->audio_need_keyframe = 1; | |
1590 priv->video_after_seek = 1; | |
1591 } | |
1592 else if (streams & 2) { | |
1593 cur_timestamp = priv->index_table[aid][priv->current_apacket].timestamp; | |
1594 if (rel_seek_secs > 0) | |
1595 while ((priv->index_table[aid][priv->current_apacket].timestamp - cur_timestamp) < rel_seek_secs * 1000){ | |
1596 priv->current_apacket += 1; | |
1597 if (priv->current_apacket >= priv->index_table_size[aid]) { | |
1598 priv->current_apacket = priv->index_table_size[aid] - 1; | |
1599 break; | |
1600 } | |
1601 } | |
1602 else if (rel_seek_secs < 0) | |
1603 while ((cur_timestamp - priv->index_table[aid][priv->current_apacket].timestamp) < - rel_seek_secs * 1000){ | |
1604 priv->current_apacket -= 1; | |
1605 if (priv->current_apacket < 0) { | |
1606 priv->current_apacket = 0; | |
1607 break; | |
1608 } | |
1609 } | |
1610 next_offset = priv->index_table[aid][priv->current_apacket].offset; | |
1611 } | |
11596
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
1612 // } |
5918
dca3016882cf
completed real seeking - working very well with audio only files
alex
parents:
5810
diff
changeset
|
1613 // printf("seek: pos: %d, current packets: a: %d, v: %d\n", |
dca3016882cf
completed real seeking - working very well with audio only files
alex
parents:
5810
diff
changeset
|
1614 // next_offset, priv->current_apacket, priv->current_vpacket); |
11596
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
1615 if (next_offset) |
6d377637ea60
Proper runtime index generation with support for growing files. Patch by rgselk <rgselknospam@yahoo.com>
alex
parents:
11441
diff
changeset
|
1616 stream_seek(demuxer->stream, next_offset); |
11441 | 1617 |
1618 demux_real_fill_buffer(demuxer); | |
1619 if (sh_audio) | |
1620 resync_audio_stream(sh_audio); | |
1621 return 1; | |
3882
c5cefeb78c40
added read_index_chunk, fixed audio_header parser for version5
alex
parents:
3877
diff
changeset
|
1622 } |
11441 | 1623 |
1624 int demux_real_control(demuxer_t *demuxer, int cmd, void *arg) | |
1625 { | |
1626 real_priv_t *priv = demuxer->priv; | |
1627 int lastpts = priv->v_pts ? priv->v_pts : priv->a_pts; | |
1628 | |
1629 switch (cmd) { | |
1630 case DEMUXER_CTRL_GET_TIME_LENGTH: | |
1631 if (priv->duration == 0) | |
1632 return DEMUXER_CTRL_DONTKNOW; | |
1633 | |
1634 *((unsigned long *)arg) = priv->duration; | |
1635 return DEMUXER_CTRL_OK; | |
1636 | |
1637 case DEMUXER_CTRL_GET_PERCENT_POS: | |
1638 if (priv->duration == 0) | |
1639 return DEMUXER_CTRL_DONTKNOW; | |
1640 | |
1641 *((int *)arg) = (int)(100 * lastpts / priv->duration); | |
1642 return DEMUXER_CTRL_OK; | |
1643 | |
1644 default: | |
1645 return DEMUXER_CTRL_NOTIMPL; | |
1646 } | |
1647 } |