annotate libmpdemux/demux_vqf.c @ 30443:f60a1db3aee4

Estimate pts of additional frame generated by tfields also if correct-pts is not set, even if it is not very relevant currently. Based on patch by John Lindgren [john lindgren tds net]
author reimar
date Mon, 01 Feb 2010 22:22:32 +0000
parents 0f1b5b68af32
children cd81fce1f010
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
29238
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 28115
diff changeset
1 /*
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 28115
diff changeset
2 * This file is part of MPlayer.
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 28115
diff changeset
3 *
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 28115
diff changeset
4 * MPlayer is free software; you can redistribute it and/or modify
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 28115
diff changeset
5 * it under the terms of the GNU General Public License as published by
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 28115
diff changeset
6 * the Free Software Foundation; either version 2 of the License, or
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 28115
diff changeset
7 * (at your option) any later version.
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 28115
diff changeset
8 *
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 28115
diff changeset
9 * MPlayer is distributed in the hope that it will be useful,
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 28115
diff changeset
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 28115
diff changeset
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 28115
diff changeset
12 * GNU General Public License for more details.
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 28115
diff changeset
13 *
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 28115
diff changeset
14 * You should have received a copy of the GNU General Public License along
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 28115
diff changeset
15 * with MPlayer; if not, write to the Free Software Foundation, Inc.,
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 28115
diff changeset
16 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 28115
diff changeset
17 */
d643e4643313 Add standard license header to all files in libmpdemux.
diego
parents: 28115
diff changeset
18
14276
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
19 #include "config.h"
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
20
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
21 #include <stdlib.h>
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
22 #include <stdio.h>
21372
1767c271d710 Remove bswap.h, use libavutil/bswap.h instead.
diego
parents: 19062
diff changeset
23 #include "libavutil/common.h"
28105
3d8fe3f052be Simplify: use AV_RL32/AV_RB32
reimar
parents: 28104
diff changeset
24 #include "libavutil/intreadwrite.h"
21507
fa99b3d31d13 Hack around libavutil/bswap.h compilation problems due to always_inline undefined.
reimar
parents: 21372
diff changeset
25 #include "mpbswap.h"
14276
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
26
22605
4d81dbdf46b9 Add explicit location for headers from the stream/ directory.
diego
parents: 21531
diff changeset
27 #include "stream/stream.h"
14276
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
28 #include "demuxer.h"
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
29 #include "stheader.h"
17012
6ff3379a0862 Unify include path handling, -I.. is in CFLAGS.
diego
parents: 16877
diff changeset
30 #include "libmpcodecs/vqf.h"
14276
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
31
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29238
diff changeset
32 static int demux_probe_vqf(demuxer_t* demuxer)
14276
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
33 {
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
34 char buf[KEYWORD_BYTES];
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
35 stream_t *s;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
36 s = demuxer->stream;
15818
faust3
parents: 14276
diff changeset
37 if(stream_read(s,buf,KEYWORD_BYTES)!=KEYWORD_BYTES)
faust3
parents: 14276
diff changeset
38 return 0;
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15818
diff changeset
39 if(memcmp(buf,"TWIN",KEYWORD_BYTES)==0) return DEMUXER_TYPE_VQF; /*version: 97012000*/
14276
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
40 return 0;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
41 }
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
42
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15818
diff changeset
43 static demuxer_t* demux_open_vqf(demuxer_t* demuxer) {
14276
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
44 sh_audio_t* sh_audio;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
45 WAVEFORMATEX* w;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
46 stream_t *s;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
47 headerInfo *hi;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
48
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
49 s = demuxer->stream;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
50
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
51 sh_audio = new_sh_audio(demuxer,0);
19062
83c3afeab35d drops casts from void * on malloc/calloc from libmpdemux code
reynaldo
parents: 17636
diff changeset
52 sh_audio->wf = w = malloc(sizeof(WAVEFORMATEX)+sizeof(headerInfo));
14276
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
53 hi = (headerInfo *)&w[1];
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
54 memset(hi,0,sizeof(headerInfo));
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
55 w->wFormatTag = 0x1;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
56 sh_audio->format = mmioFOURCC('T','W','I','N'); /* TWinVQ */
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
57 w->nChannels = sh_audio->channels = 2;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
58 w->nSamplesPerSec = sh_audio->samplerate = 44100;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
59 w->nAvgBytesPerSec = w->nSamplesPerSec*sh_audio->channels*2;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
60 w->nBlockAlign = 0;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
61 sh_audio->samplesize = 2;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
62 w->wBitsPerSample = 8*sh_audio->samplesize;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
63 w->cbSize = 0;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
64 strcpy(hi->ID,"TWIN");
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
65 stream_read(s,hi->ID+KEYWORD_BYTES,VERSION_BYTES); /* fourcc+version_id */
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
66 while(1)
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
67 {
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
68 char chunk_id[4];
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
69 unsigned chunk_size;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
70 hi->size=chunk_size=stream_read_dword(s); /* include itself */
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
71 stream_read(s,chunk_id,4);
28115
1a9b1b7e285f Add extra checks to avoid crashes with broken vqf files.
reimar
parents: 28105
diff changeset
72 if (chunk_size < 8) return NULL;
1a9b1b7e285f Add extra checks to avoid crashes with broken vqf files.
reimar
parents: 28105
diff changeset
73 chunk_size -= 8;
28105
3d8fe3f052be Simplify: use AV_RL32/AV_RB32
reimar
parents: 28104
diff changeset
74 if(AV_RL32(chunk_id)==mmioFOURCC('C','O','M','M'))
14276
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
75 {
28115
1a9b1b7e285f Add extra checks to avoid crashes with broken vqf files.
reimar
parents: 28105
diff changeset
76 char buf[BUFSIZ];
14276
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
77 unsigned i,subchunk_size;
28115
1a9b1b7e285f Add extra checks to avoid crashes with broken vqf files.
reimar
parents: 28105
diff changeset
78 if (chunk_size > sizeof(buf) || chunk_size < 20) return NULL;
1a9b1b7e285f Add extra checks to avoid crashes with broken vqf files.
reimar
parents: 28105
diff changeset
79 if(stream_read(s,buf,chunk_size)!=chunk_size) return NULL;
14276
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
80 i=0;
28105
3d8fe3f052be Simplify: use AV_RL32/AV_RB32
reimar
parents: 28104
diff changeset
81 subchunk_size = AV_RB32(buf);
3d8fe3f052be Simplify: use AV_RL32/AV_RB32
reimar
parents: 28104
diff changeset
82 hi->channelMode = AV_RB32(buf + 4);
14276
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
83 w->nChannels=sh_audio->channels=hi->channelMode+1; /*0-mono;1-stereo*/
28105
3d8fe3f052be Simplify: use AV_RL32/AV_RB32
reimar
parents: 28104
diff changeset
84 hi->bitRate = AV_RB32(buf + 8);
14276
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
85 sh_audio->i_bps=hi->bitRate*1000/8; /* bitrate kbit/s */
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
86 w->nAvgBytesPerSec = sh_audio->i_bps;
28105
3d8fe3f052be Simplify: use AV_RL32/AV_RB32
reimar
parents: 28104
diff changeset
87 hi->samplingRate = AV_RB32(buf + 12);
14276
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
88 switch(hi->samplingRate){
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
89 case 44:
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
90 w->nSamplesPerSec=44100;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
91 break;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
92 case 22:
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
93 w->nSamplesPerSec=22050;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
94 break;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
95 case 11:
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
96 w->nSamplesPerSec=11025;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
97 break;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
98 default:
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
99 w->nSamplesPerSec=hi->samplingRate*1000;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
100 break;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
101 }
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
102 sh_audio->samplerate=w->nSamplesPerSec;
28105
3d8fe3f052be Simplify: use AV_RL32/AV_RB32
reimar
parents: 28104
diff changeset
103 hi->securityLevel = AV_RB32(buf + 16);
14276
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
104 w->nBlockAlign = 0;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
105 sh_audio->samplesize = 4;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
106 w->wBitsPerSample = 8*sh_audio->samplesize;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
107 w->cbSize = 0;
28115
1a9b1b7e285f Add extra checks to avoid crashes with broken vqf files.
reimar
parents: 28105
diff changeset
108 if (subchunk_size > chunk_size - 4) continue;
14276
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
109 i+=subchunk_size+4;
28115
1a9b1b7e285f Add extra checks to avoid crashes with broken vqf files.
reimar
parents: 28105
diff changeset
110 while(i + 8 < chunk_size)
14276
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
111 {
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
112 unsigned slen,sid;
28115
1a9b1b7e285f Add extra checks to avoid crashes with broken vqf files.
reimar
parents: 28105
diff changeset
113 char sdata[BUFSIZ];
28105
3d8fe3f052be Simplify: use AV_RL32/AV_RB32
reimar
parents: 28104
diff changeset
114 sid = AV_RL32(buf + i); i+=4;
3d8fe3f052be Simplify: use AV_RL32/AV_RB32
reimar
parents: 28104
diff changeset
115 slen = AV_RB32(buf + i); i+=4;
28115
1a9b1b7e285f Add extra checks to avoid crashes with broken vqf files.
reimar
parents: 28105
diff changeset
116 if (slen > sizeof(sdata) - 1 || slen > chunk_size - i) break;
14276
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
117 if(sid==mmioFOURCC('D','S','I','Z'))
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
118 {
28105
3d8fe3f052be Simplify: use AV_RL32/AV_RB32
reimar
parents: 28104
diff changeset
119 hi->Dsiz=AV_RB32(buf + i);
14276
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
120 continue; /* describes the same info as size of DATA chunk */
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
121 }
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
122 memcpy(sdata,&buf[i],slen); sdata[slen]=0; i+=slen;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
123 if(sid==mmioFOURCC('N','A','M','E'))
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
124 {
21531
a90aa203186c Get rid of min/max macros from aviheader.h, they do not belong here.
reimar
parents: 21507
diff changeset
125 memcpy(hi->Name,sdata,FFMIN(BUFSIZ,slen));
14276
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
126 demux_info_add(demuxer,"Title",sdata);
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
127 }
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
128 else
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
129 if(sid==mmioFOURCC('A','U','T','H'))
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
130 {
21531
a90aa203186c Get rid of min/max macros from aviheader.h, they do not belong here.
reimar
parents: 21507
diff changeset
131 memcpy(hi->Auth,sdata,FFMIN(BUFSIZ,slen));
14276
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
132 demux_info_add(demuxer,"Author",sdata);
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
133 }
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
134 else
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
135 if(sid==mmioFOURCC('C','O','M','T'))
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
136 {
21531
a90aa203186c Get rid of min/max macros from aviheader.h, they do not belong here.
reimar
parents: 21507
diff changeset
137 memcpy(hi->Comt,sdata,FFMIN(BUFSIZ,slen));
14276
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
138 demux_info_add(demuxer,"Comment",sdata);
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
139 }
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
140 else
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
141 if(sid==mmioFOURCC('(','c',')',' '))
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
142 {
21531
a90aa203186c Get rid of min/max macros from aviheader.h, they do not belong here.
reimar
parents: 21507
diff changeset
143 memcpy(hi->Cpyr,sdata,FFMIN(BUFSIZ,slen));
14276
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
144 demux_info_add(demuxer,"Copyright",sdata);
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
145 }
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
146 else
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
147 if(sid==mmioFOURCC('F','I','L','E'))
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
148 {
21531
a90aa203186c Get rid of min/max macros from aviheader.h, they do not belong here.
reimar
parents: 21507
diff changeset
149 memcpy(hi->File,sdata,FFMIN(BUFSIZ,slen));
14276
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
150 }
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
151 else
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
152 if(sid==mmioFOURCC('A','L','B','M')) demux_info_add(demuxer,"Album",sdata);
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
153 else
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
154 if(sid==mmioFOURCC('Y','E','A','R')) demux_info_add(demuxer,"Date",sdata);
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
155 else
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
156 if(sid==mmioFOURCC('T','R','A','C')) demux_info_add(demuxer,"Track",sdata);
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
157 else
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
158 if(sid==mmioFOURCC('E','N','C','D')) demux_info_add(demuxer,"Encoder",sdata);
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
159 else
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
160 mp_msg(MSGT_DEMUX, MSGL_V, "Unhandled subchunk '%c%c%c%c'='%s'\n",((char *)&sid)[0],((char *)&sid)[1],((char *)&sid)[2],((char *)&sid)[3],sdata);
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
161 /* other stuff is unrecognized due untranslatable japan's idiomatics */
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
162 }
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
163 }
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
164 else
28105
3d8fe3f052be Simplify: use AV_RL32/AV_RB32
reimar
parents: 28104
diff changeset
165 if(AV_RL32(chunk_id)==mmioFOURCC('D','A','T','A'))
14276
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
166 {
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
167 demuxer->movi_start=stream_tell(s);
28115
1a9b1b7e285f Add extra checks to avoid crashes with broken vqf files.
reimar
parents: 28105
diff changeset
168 demuxer->movi_end=demuxer->movi_start+chunk_size;
16750
0a31740dd5e6 Use PRI?64 defines as format strings for 64 bit variables.
reimar
parents: 16175
diff changeset
169 mp_msg(MSGT_DEMUX, MSGL_V, "Found data at %"PRIX64" size %"PRIu64"\n",demuxer->movi_start,demuxer->movi_end);
14276
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
170 /* Done! play it */
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
171 break;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
172 }
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
173 else
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
174 {
28104
6ea280cd6b95 Avoid useless casts.
reimar
parents: 26299
diff changeset
175 mp_msg(MSGT_DEMUX, MSGL_V, "Unhandled chunk '%c%c%c%c' %u bytes\n",chunk_id[0],chunk_id[1],chunk_id[2],chunk_id[3],chunk_size);
28115
1a9b1b7e285f Add extra checks to avoid crashes with broken vqf files.
reimar
parents: 28105
diff changeset
176 stream_skip(s,chunk_size); /*unknown chunk type */
14276
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
177 }
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
178 }
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
179
26299
4d56038ec730 Fix lots and lots of other demuxers broken by r26301
reimar
parents: 25883
diff changeset
180 demuxer->audio->id = 0;
14276
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
181 demuxer->audio->sh = sh_audio;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
182 sh_audio->ds = demuxer->audio;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
183 stream_seek(s,demuxer->movi_start);
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
184 demuxer->seekable=0;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
185 return demuxer;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
186 }
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
187
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15818
diff changeset
188 static int demux_vqf_fill_buffer(demuxer_t* demuxer, demux_stream_t *ds) {
14276
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
189 sh_audio_t* sh_audio = demuxer->audio->sh;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
190 int l = sh_audio->wf->nAvgBytesPerSec;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
191 off_t spos = stream_tell(demuxer->stream);
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
192 demux_packet_t* dp;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
193
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
194 if(stream_eof(demuxer->stream))
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
195 return 0;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
196
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
197 dp = new_demux_packet(l);
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
198 ds->pts = spos / (float)(sh_audio->wf->nAvgBytesPerSec);
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
199 ds->pos = spos;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
200
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
201 l=stream_read(demuxer->stream,dp->buffer,l);
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
202 resize_demux_packet(dp,l);
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
203 ds_add_packet(ds,dp);
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
204
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
205 return 1;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
206 }
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
207
17636
b849a99cdc3c Second-try commit of this patch.
corey
parents: 17569
diff changeset
208 static void demux_seek_vqf(demuxer_t *demuxer,float rel_seek_secs,float audio_delay,int flags){
14276
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
209 #if 0
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
210 stream_t* s = demuxer->stream;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
211 sh_audio_t* sh_audio = demuxer->audio->sh;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
212 off_t base,pos;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
213
25883
baf32110d3fc Use defines to give names to the different seek flags.
reimar
parents: 25707
diff changeset
214 base = (flags & SEEK_ABSOLUTE) ? demuxer->movi_start : stream_tell(s);
baf32110d3fc Use defines to give names to the different seek flags.
reimar
parents: 25707
diff changeset
215 if(flags & SEEK_FACTOR)
14276
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
216 pos = base + ((demuxer->movi_end - demuxer->movi_start)*rel_seek_secs);
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
217 else
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
218 pos = base + (rel_seek_secs*sh_audio->i_bps);
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
219
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
220 pos -= (pos % (sh_audio->channels * sh_audio->samplesize) );
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
221 stream_seek(s,pos);
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
222 #endif
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
223 }
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
224
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15818
diff changeset
225 static void demux_close_vqf(demuxer_t* demuxer) {}
6b86089c2edd Demuxer modularization
rtognimp
parents: 15818
diff changeset
226
6b86089c2edd Demuxer modularization
rtognimp
parents: 15818
diff changeset
227
25707
d4fe6e23283e Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents: 22605
diff changeset
228 const demuxer_desc_t demuxer_desc_vqf = {
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15818
diff changeset
229 "TwinVQ demuxer",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15818
diff changeset
230 "vqf",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15818
diff changeset
231 "VQF",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15818
diff changeset
232 "Nick Kurshev",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15818
diff changeset
233 "ported frm MPlayerXP",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15818
diff changeset
234 DEMUXER_TYPE_VQF,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15818
diff changeset
235 1, // safe autodetect
6b86089c2edd Demuxer modularization
rtognimp
parents: 15818
diff changeset
236 demux_probe_vqf,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15818
diff changeset
237 demux_vqf_fill_buffer,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15818
diff changeset
238 demux_open_vqf,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15818
diff changeset
239 demux_close_vqf,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15818
diff changeset
240 demux_seek_vqf,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15818
diff changeset
241 NULL
6b86089c2edd Demuxer modularization
rtognimp
parents: 15818
diff changeset
242 };