annotate libmpdemux/demux_vqf.c @ 20567:a45bc176a16d

paragraph about groff and UTF-8
author diego
date Wed, 01 Nov 2006 17:31:11 +0000
parents 83c3afeab35d
children 1767c271d710
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
14276
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
1 #include "config.h"
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
2
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
3 #include <stdlib.h>
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
4 #include <stdio.h>
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
5 #include "bswap.h"
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
6
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
7 #include "stream.h"
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
8 #include "demuxer.h"
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
9 #include "stheader.h"
17012
6ff3379a0862 Unify include path handling, -I.. is in CFLAGS.
diego
parents: 16877
diff changeset
10 #include "libmpcodecs/vqf.h"
14276
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
11
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15818
diff changeset
12 static int demux_probe_vqf(demuxer_t* demuxer)
14276
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
13 {
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
14 char buf[KEYWORD_BYTES];
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
15 stream_t *s;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
16 s = demuxer->stream;
15818
faust3
parents: 14276
diff changeset
17 if(stream_read(s,buf,KEYWORD_BYTES)!=KEYWORD_BYTES)
faust3
parents: 14276
diff changeset
18 return 0;
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15818
diff changeset
19 if(memcmp(buf,"TWIN",KEYWORD_BYTES)==0) return DEMUXER_TYPE_VQF; /*version: 97012000*/
14276
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
20 return 0;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
21 }
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
22
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15818
diff changeset
23 static demuxer_t* demux_open_vqf(demuxer_t* demuxer) {
14276
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
24 sh_audio_t* sh_audio;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
25 WAVEFORMATEX* w;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
26 stream_t *s;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
27 headerInfo *hi;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
28
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
29 s = demuxer->stream;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
30
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
31 sh_audio = new_sh_audio(demuxer,0);
19062
83c3afeab35d drops casts from void * on malloc/calloc from libmpdemux code
reynaldo
parents: 17636
diff changeset
32 sh_audio->wf = w = malloc(sizeof(WAVEFORMATEX)+sizeof(headerInfo));
14276
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
33 hi = (headerInfo *)&w[1];
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
34 memset(hi,0,sizeof(headerInfo));
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
35 w->wFormatTag = 0x1;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
36 sh_audio->format = mmioFOURCC('T','W','I','N'); /* TWinVQ */
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
37 w->nChannels = sh_audio->channels = 2;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
38 w->nSamplesPerSec = sh_audio->samplerate = 44100;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
39 w->nAvgBytesPerSec = w->nSamplesPerSec*sh_audio->channels*2;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
40 w->nBlockAlign = 0;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
41 sh_audio->samplesize = 2;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
42 w->wBitsPerSample = 8*sh_audio->samplesize;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
43 w->cbSize = 0;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
44 strcpy(hi->ID,"TWIN");
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
45 stream_read(s,hi->ID+KEYWORD_BYTES,VERSION_BYTES); /* fourcc+version_id */
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
46 while(1)
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
47 {
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
48 char chunk_id[4];
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
49 unsigned chunk_size;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
50 hi->size=chunk_size=stream_read_dword(s); /* include itself */
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
51 stream_read(s,chunk_id,4);
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
52 if(*((uint32_t *)&chunk_id[0])==mmioFOURCC('C','O','M','M'))
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
53 {
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
54 char buf[chunk_size-8];
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
55 unsigned i,subchunk_size;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
56 if(stream_read(s,buf,chunk_size-8)!=chunk_size-8) return NULL;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
57 i=0;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
58 subchunk_size=be2me_32(*((uint32_t *)&buf[0]));
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
59 hi->channelMode=be2me_32(*((uint32_t *)&buf[4]));
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
60 w->nChannels=sh_audio->channels=hi->channelMode+1; /*0-mono;1-stereo*/
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
61 hi->bitRate=be2me_32(*((uint32_t *)&buf[8]));
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
62 sh_audio->i_bps=hi->bitRate*1000/8; /* bitrate kbit/s */
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
63 w->nAvgBytesPerSec = sh_audio->i_bps;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
64 hi->samplingRate=be2me_32(*((uint32_t *)&buf[12]));
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
65 switch(hi->samplingRate){
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
66 case 44:
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
67 w->nSamplesPerSec=44100;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
68 break;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
69 case 22:
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
70 w->nSamplesPerSec=22050;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
71 break;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
72 case 11:
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
73 w->nSamplesPerSec=11025;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
74 break;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
75 default:
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
76 w->nSamplesPerSec=hi->samplingRate*1000;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
77 break;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
78 }
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
79 sh_audio->samplerate=w->nSamplesPerSec;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
80 hi->securityLevel=be2me_32(*((uint32_t *)&buf[16]));
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
81 w->nBlockAlign = 0;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
82 sh_audio->samplesize = 4;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
83 w->wBitsPerSample = 8*sh_audio->samplesize;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
84 w->cbSize = 0;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
85 i+=subchunk_size+4;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
86 while(i<chunk_size-8)
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
87 {
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
88 unsigned slen,sid;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
89 char sdata[chunk_size];
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
90 sid=*((uint32_t *)&buf[i]); i+=4;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
91 slen=be2me_32(*((uint32_t *)&buf[i])); i+=4;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
92 if(sid==mmioFOURCC('D','S','I','Z'))
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
93 {
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
94 hi->Dsiz=be2me_32(*((uint32_t *)&buf[i]));
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
95 continue; /* describes the same info as size of DATA chunk */
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
96 }
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
97 memcpy(sdata,&buf[i],slen); sdata[slen]=0; i+=slen;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
98 if(sid==mmioFOURCC('N','A','M','E'))
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
99 {
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
100 memcpy(hi->Name,sdata,min(BUFSIZ,slen));
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
101 demux_info_add(demuxer,"Title",sdata);
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
102 }
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
103 else
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
104 if(sid==mmioFOURCC('A','U','T','H'))
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
105 {
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
106 memcpy(hi->Auth,sdata,min(BUFSIZ,slen));
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
107 demux_info_add(demuxer,"Author",sdata);
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
108 }
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
109 else
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
110 if(sid==mmioFOURCC('C','O','M','T'))
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
111 {
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
112 memcpy(hi->Comt,sdata,min(BUFSIZ,slen));
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
113 demux_info_add(demuxer,"Comment",sdata);
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
114 }
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
115 else
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
116 if(sid==mmioFOURCC('(','c',')',' '))
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
117 {
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
118 memcpy(hi->Cpyr,sdata,min(BUFSIZ,slen));
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
119 demux_info_add(demuxer,"Copyright",sdata);
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
120 }
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
121 else
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
122 if(sid==mmioFOURCC('F','I','L','E'))
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
123 {
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
124 memcpy(hi->File,sdata,min(BUFSIZ,slen));
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
125 }
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
126 else
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
127 if(sid==mmioFOURCC('A','L','B','M')) demux_info_add(demuxer,"Album",sdata);
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
128 else
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
129 if(sid==mmioFOURCC('Y','E','A','R')) demux_info_add(demuxer,"Date",sdata);
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
130 else
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
131 if(sid==mmioFOURCC('T','R','A','C')) demux_info_add(demuxer,"Track",sdata);
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
132 else
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
133 if(sid==mmioFOURCC('E','N','C','D')) demux_info_add(demuxer,"Encoder",sdata);
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
134 else
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
135 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
136 /* other stuff is unrecognized due untranslatable japan's idiomatics */
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
137 }
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
138 }
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
139 else
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
140 if(*((uint32_t *)&chunk_id[0])==mmioFOURCC('D','A','T','A'))
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
141 {
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
142 demuxer->movi_start=stream_tell(s);
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
143 demuxer->movi_end=demuxer->movi_start+chunk_size-8;
16750
0a31740dd5e6 Use PRI?64 defines as format strings for 64 bit variables.
reimar
parents: 16175
diff changeset
144 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
145 /* Done! play it */
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
146 break;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
147 }
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
148 else
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
149 {
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
150 mp_msg(MSGT_DEMUX, MSGL_V, "Unhandled chunk '%c%c%c%c' %u bytes\n",((char *)&chunk_id)[0],((char *)&chunk_id)[1],((char *)&chunk_id)[2],((char *)&chunk_id)[3],chunk_size);
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
151 stream_skip(s,chunk_size-8); /*unknown chunk type */
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
152 }
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
153 }
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
154
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
155 demuxer->audio->sh = sh_audio;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
156 sh_audio->ds = demuxer->audio;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
157 stream_seek(s,demuxer->movi_start);
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
158 demuxer->seekable=0;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
159 return demuxer;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
160 }
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
161
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15818
diff changeset
162 static int demux_vqf_fill_buffer(demuxer_t* demuxer, demux_stream_t *ds) {
14276
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
163 sh_audio_t* sh_audio = demuxer->audio->sh;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
164 int l = sh_audio->wf->nAvgBytesPerSec;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
165 off_t spos = stream_tell(demuxer->stream);
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
166 demux_packet_t* dp;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
167
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
168 if(stream_eof(demuxer->stream))
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
169 return 0;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
170
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
171 dp = new_demux_packet(l);
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
172 ds->pts = spos / (float)(sh_audio->wf->nAvgBytesPerSec);
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
173 ds->pos = spos;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
174
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
175 l=stream_read(demuxer->stream,dp->buffer,l);
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
176 resize_demux_packet(dp,l);
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
177 ds_add_packet(ds,dp);
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
178
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
179 return 1;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
180 }
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
181
17636
b849a99cdc3c Second-try commit of this patch.
corey
parents: 17569
diff changeset
182 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
183 #if 0
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
184 stream_t* s = demuxer->stream;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
185 sh_audio_t* sh_audio = demuxer->audio->sh;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
186 off_t base,pos;
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
187
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
188 base = (flags & 1) ? demuxer->movi_start : stream_tell(s);
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
189 if(flags & 2)
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
190 pos = base + ((demuxer->movi_end - demuxer->movi_start)*rel_seek_secs);
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
191 else
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
192 pos = base + (rel_seek_secs*sh_audio->i_bps);
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
193
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
194 pos -= (pos % (sh_audio->channels * sh_audio->samplesize) );
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
195 stream_seek(s,pos);
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
196 #endif
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
197 }
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents:
diff changeset
198
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15818
diff changeset
199 static void demux_close_vqf(demuxer_t* demuxer) {}
6b86089c2edd Demuxer modularization
rtognimp
parents: 15818
diff changeset
200
6b86089c2edd Demuxer modularization
rtognimp
parents: 15818
diff changeset
201
6b86089c2edd Demuxer modularization
rtognimp
parents: 15818
diff changeset
202 demuxer_desc_t demuxer_desc_vqf = {
6b86089c2edd Demuxer modularization
rtognimp
parents: 15818
diff changeset
203 "TwinVQ demuxer",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15818
diff changeset
204 "vqf",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15818
diff changeset
205 "VQF",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15818
diff changeset
206 "Nick Kurshev",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15818
diff changeset
207 "ported frm MPlayerXP",
6b86089c2edd Demuxer modularization
rtognimp
parents: 15818
diff changeset
208 DEMUXER_TYPE_VQF,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15818
diff changeset
209 1, // safe autodetect
6b86089c2edd Demuxer modularization
rtognimp
parents: 15818
diff changeset
210 demux_probe_vqf,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15818
diff changeset
211 demux_vqf_fill_buffer,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15818
diff changeset
212 demux_open_vqf,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15818
diff changeset
213 demux_close_vqf,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15818
diff changeset
214 demux_seek_vqf,
6b86089c2edd Demuxer modularization
rtognimp
parents: 15818
diff changeset
215 NULL
6b86089c2edd Demuxer modularization
rtognimp
parents: 15818
diff changeset
216 };