diff options
author | rtognimp <rtognimp@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-12-29 19:51:56 +0000 |
---|---|---|
committer | rtognimp <rtognimp@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-12-29 19:51:56 +0000 |
commit | 939e46626eb93e301ff99e6210e5a666bad250ca (patch) | |
tree | 7e42f8a986e1607129fda4b5b50579897c6e086c /libmpdemux | |
parent | 77456b04d9a3617ae0dc24c4dbac0f52017a8524 (diff) | |
download | mpv-939e46626eb93e301ff99e6210e5a666bad250ca.tar.bz2 mpv-939e46626eb93e301ff99e6210e5a666bad250ca.tar.xz |
TwinVQ decoder and demuxer
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14277 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r-- | libmpdemux/Makefile | 2 | ||||
-rw-r--r-- | libmpdemux/demux_vqf.c | 201 | ||||
-rw-r--r-- | libmpdemux/demuxer.c | 26 | ||||
-rw-r--r-- | libmpdemux/demuxer.h | 3 |
4 files changed, 230 insertions, 2 deletions
diff --git a/libmpdemux/Makefile b/libmpdemux/Makefile index be9a428e90..9c9813c2a8 100644 --- a/libmpdemux/Makefile +++ b/libmpdemux/Makefile @@ -3,7 +3,7 @@ LIBNAME = libmpdemux.a include ../config.mak -SRCS = mp3_hdr.c video.c mpeg_hdr.c cache2.c asfheader.c aviheader.c aviprint.c muxer.c muxer_avi.c muxer_mpeg.c demux_asf.c demux_avi.c demux_mov.c parse_mp4.c demux_mpg.c demux_ty.c demux_ty_osd.c demux_pva.c demux_viv.c demuxer.c dvdnav_stream.c open.c parse_es.c stream.c stream_file.c stream_netstream.c stream_vcd.c stream_null.c stream_ftp.c tv.c tvi_dummy.c tvi_v4l.c tvi_v4l2.c tvi_bsdbt848.c frequencies.c demux_fli.c demux_real.c demux_y4m.c yuv4mpeg.c yuv4mpeg_ratio.c demux_nuv.c demux_film.c demux_roq.c mf.c demux_mf.c demux_audio.c demux_demuxers.c demux_ogg.c cdda.c demux_rawaudio.c demux_rawvideo.c cddb.c cdinfo.c demux_rawdv.c ai_alsa.c ai_alsa1x.c ai_oss.c audio_in.c demux_smjpeg.c demux_lmlm4.c cue_read.c extension.c demux_gif.c demux_ts.c demux_realaud.c url.c muxer_rawvideo.c demux_lavf.c demux_nsv.c +SRCS = mp3_hdr.c video.c mpeg_hdr.c cache2.c asfheader.c aviheader.c aviprint.c muxer.c muxer_avi.c muxer_mpeg.c demux_asf.c demux_avi.c demux_mov.c parse_mp4.c demux_mpg.c demux_ty.c demux_ty_osd.c demux_pva.c demux_viv.c demuxer.c dvdnav_stream.c open.c parse_es.c stream.c stream_file.c stream_netstream.c stream_vcd.c stream_null.c stream_ftp.c tv.c tvi_dummy.c tvi_v4l.c tvi_v4l2.c tvi_bsdbt848.c frequencies.c demux_fli.c demux_real.c demux_y4m.c yuv4mpeg.c yuv4mpeg_ratio.c demux_nuv.c demux_film.c demux_roq.c mf.c demux_mf.c demux_audio.c demux_demuxers.c demux_ogg.c cdda.c demux_rawaudio.c demux_rawvideo.c cddb.c cdinfo.c demux_rawdv.c ai_alsa.c ai_alsa1x.c ai_oss.c audio_in.c demux_smjpeg.c demux_lmlm4.c cue_read.c extension.c demux_gif.c demux_ts.c demux_realaud.c url.c muxer_rawvideo.c demux_lavf.c demux_nsv.c demux_vqf.c ifeq ($(XMMS_PLUGINS),yes) SRCS += demux_xmms.c endif diff --git a/libmpdemux/demux_vqf.c b/libmpdemux/demux_vqf.c new file mode 100644 index 0000000000..5b0d9842e2 --- /dev/null +++ b/libmpdemux/demux_vqf.c @@ -0,0 +1,201 @@ +#include "config.h" + +#include <stdlib.h> +#include <stdio.h> +#include "bswap.h" + +#include "stream.h" +#include "demuxer.h" +#include "stheader.h" +#include "../libmpcodecs/vqf.h" + +extern void resync_audio_stream(sh_audio_t *sh_audio); + +int demux_probe_vqf(demuxer_t* demuxer) +{ + char buf[KEYWORD_BYTES]; + stream_t *s; + s = demuxer->stream; + stream_read(s,buf,KEYWORD_BYTES); + if(memcmp(buf,"TWIN",KEYWORD_BYTES)==0) return 1; /*version: 97012000*/ + return 0; +} + +demuxer_t* demux_open_vqf(demuxer_t* demuxer) { + sh_audio_t* sh_audio; + WAVEFORMATEX* w; + stream_t *s; + headerInfo *hi; + + s = demuxer->stream; + + sh_audio = new_sh_audio(demuxer,0); + sh_audio->wf = w = (WAVEFORMATEX*)malloc(sizeof(WAVEFORMATEX)+sizeof(headerInfo)); + hi = (headerInfo *)&w[1]; + memset(hi,0,sizeof(headerInfo)); + w->wFormatTag = 0x1; + sh_audio->format = mmioFOURCC('T','W','I','N'); /* TWinVQ */ + w->nChannels = sh_audio->channels = 2; + w->nSamplesPerSec = sh_audio->samplerate = 44100; + w->nAvgBytesPerSec = w->nSamplesPerSec*sh_audio->channels*2; + w->nBlockAlign = 0; + sh_audio->samplesize = 2; + w->wBitsPerSample = 8*sh_audio->samplesize; + w->cbSize = 0; + strcpy(hi->ID,"TWIN"); + stream_read(s,hi->ID+KEYWORD_BYTES,VERSION_BYTES); /* fourcc+version_id */ + while(1) + { + char chunk_id[4]; + unsigned chunk_size; + hi->size=chunk_size=stream_read_dword(s); /* include itself */ + stream_read(s,chunk_id,4); + if(*((uint32_t *)&chunk_id[0])==mmioFOURCC('C','O','M','M')) + { + char buf[chunk_size-8]; + unsigned i,subchunk_size; + if(stream_read(s,buf,chunk_size-8)!=chunk_size-8) return NULL; + i=0; + subchunk_size=be2me_32(*((uint32_t *)&buf[0])); + hi->channelMode=be2me_32(*((uint32_t *)&buf[4])); + w->nChannels=sh_audio->channels=hi->channelMode+1; /*0-mono;1-stereo*/ + hi->bitRate=be2me_32(*((uint32_t *)&buf[8])); + sh_audio->i_bps=hi->bitRate*1000/8; /* bitrate kbit/s */ + w->nAvgBytesPerSec = sh_audio->i_bps; + hi->samplingRate=be2me_32(*((uint32_t *)&buf[12])); + switch(hi->samplingRate){ + case 44: + w->nSamplesPerSec=44100; + break; + case 22: + w->nSamplesPerSec=22050; + break; + case 11: + w->nSamplesPerSec=11025; + break; + default: + w->nSamplesPerSec=hi->samplingRate*1000; + break; + } + sh_audio->samplerate=w->nSamplesPerSec; + hi->securityLevel=be2me_32(*((uint32_t *)&buf[16])); + w->nBlockAlign = 0; + sh_audio->samplesize = 4; + w->wBitsPerSample = 8*sh_audio->samplesize; + w->cbSize = 0; + i+=subchunk_size+4; + while(i<chunk_size-8) + { + unsigned slen,sid; + char sdata[chunk_size]; + sid=*((uint32_t *)&buf[i]); i+=4; + slen=be2me_32(*((uint32_t *)&buf[i])); i+=4; + if(sid==mmioFOURCC('D','S','I','Z')) + { + hi->Dsiz=be2me_32(*((uint32_t *)&buf[i])); + continue; /* describes the same info as size of DATA chunk */ + } + memcpy(sdata,&buf[i],slen); sdata[slen]=0; i+=slen; + if(sid==mmioFOURCC('N','A','M','E')) + { + memcpy(hi->Name,sdata,min(BUFSIZ,slen)); + demux_info_add(demuxer,"Title",sdata); + } + else + if(sid==mmioFOURCC('A','U','T','H')) + { + memcpy(hi->Auth,sdata,min(BUFSIZ,slen)); + demux_info_add(demuxer,"Author",sdata); + } + else + if(sid==mmioFOURCC('C','O','M','T')) + { + memcpy(hi->Comt,sdata,min(BUFSIZ,slen)); + demux_info_add(demuxer,"Comment",sdata); + } + else + if(sid==mmioFOURCC('(','c',')',' ')) + { + memcpy(hi->Cpyr,sdata,min(BUFSIZ,slen)); + demux_info_add(demuxer,"Copyright",sdata); + } + else + if(sid==mmioFOURCC('F','I','L','E')) + { + memcpy(hi->File,sdata,min(BUFSIZ,slen)); + } + else + if(sid==mmioFOURCC('A','L','B','M')) demux_info_add(demuxer,"Album",sdata); + else + if(sid==mmioFOURCC('Y','E','A','R')) demux_info_add(demuxer,"Date",sdata); + else + if(sid==mmioFOURCC('T','R','A','C')) demux_info_add(demuxer,"Track",sdata); + else + if(sid==mmioFOURCC('E','N','C','D')) demux_info_add(demuxer,"Encoder",sdata); + else + 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); + /* other stuff is unrecognized due untranslatable japan's idiomatics */ + } + } + else + if(*((uint32_t *)&chunk_id[0])==mmioFOURCC('D','A','T','A')) + { + demuxer->movi_start=stream_tell(s); + demuxer->movi_end=demuxer->movi_start+chunk_size-8; + mp_msg(MSGT_DEMUX, MSGL_V, "Found data at %llX size %llu\n",demuxer->movi_start,demuxer->movi_end); + /* Done! play it */ + break; + } + else + { + 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); + stream_skip(s,chunk_size-8); /*unknown chunk type */ + } + } + + demuxer->audio->sh = sh_audio; + sh_audio->ds = demuxer->audio; + stream_seek(s,demuxer->movi_start); + demuxer->seekable=0; + return demuxer; +} + +int demux_vqf_fill_buffer(demuxer_t* demuxer, demux_stream_t *ds) { + sh_audio_t* sh_audio = demuxer->audio->sh; + int l = sh_audio->wf->nAvgBytesPerSec; + off_t spos = stream_tell(demuxer->stream); + demux_packet_t* dp; + + if(stream_eof(demuxer->stream)) + return 0; + + dp = new_demux_packet(l); + ds->pts = spos / (float)(sh_audio->wf->nAvgBytesPerSec); + ds->pos = spos; + + l=stream_read(demuxer->stream,dp->buffer,l); + resize_demux_packet(dp,l); + ds_add_packet(ds,dp); + + return 1; +} + +void demux_seek_vqf(demuxer_t *demuxer,float rel_seek_secs,int flags){ +#if 0 + stream_t* s = demuxer->stream; + sh_audio_t* sh_audio = demuxer->audio->sh; + off_t base,pos; + + base = (flags & 1) ? demuxer->movi_start : stream_tell(s); + if(flags & 2) + pos = base + ((demuxer->movi_end - demuxer->movi_start)*rel_seek_secs); + else + pos = base + (rel_seek_secs*sh_audio->i_bps); + + pos -= (pos % (sh_audio->channels * sh_audio->samplesize) ); + stream_seek(s,pos); + resync_audio_stream(sh_audio); +#endif +} + +void demux_close_vqf(demuxer_t* demuxer) {} diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index 503a46f5b2..d08961fe08 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -156,6 +156,7 @@ extern void demux_close_mkv(demuxer_t* demuxer); extern void demux_close_ra(demuxer_t* demuxer); extern void demux_close_ty(demuxer_t* demuxer); extern void demux_close_lavf(demuxer_t* demuxer); +extern void demux_close_vqf(demuxer_t* demuxer); #ifdef USE_TV @@ -241,6 +242,8 @@ void free_demuxer(demuxer_t *demuxer){ demux_close_mpg(demuxer); break; case DEMUXER_TYPE_REALAUDIO: demux_close_ra(demuxer); break; + case DEMUXER_TYPE_VQF: + demux_close_vqf(demuxer); break; #ifdef USE_LIBAVFORMAT case DEMUXER_TYPE_LAVF: demux_close_lavf(demuxer); break; @@ -326,6 +329,7 @@ int demux_xmms_fill_buffer(demuxer_t *demux,demux_stream_t *ds); int demux_gif_fill_buffer(demuxer_t *demux); int demux_ts_fill_buffer(demuxer_t *demux); int demux_ra_fill_buffer(demuxer_t *demux); +int demux_vqf_fill_buffer(demuxer_t *demux); extern int demux_demuxers_fill_buffer(demuxer_t *demux,demux_stream_t *ds); extern int demux_ogg_fill_buffer(demuxer_t *d); @@ -390,6 +394,7 @@ int demux_fill_buffer(demuxer_t *demux,demux_stream_t *ds){ case DEMUXER_TYPE_MPEG_TS: return demux_ts_fill_buffer(demux); case DEMUXER_TYPE_REALAUDIO: return demux_ra_fill_buffer(demux); + case DEMUXER_TYPE_VQF: return demux_vqf_fill_buffer(demux); #ifdef USE_LIBAVFORMAT case DEMUXER_TYPE_LAVF: return demux_lavf_fill_buffer(demux); #endif @@ -634,6 +639,8 @@ extern int demux_open_ts(demuxer_t *demuxer); extern int demux_open_mkv(demuxer_t *demuxer); extern int ra_check_file(demuxer_t *demuxer); extern int demux_open_ra(demuxer_t* demuxer); +extern int demux_probe_vqf(demuxer_t *demuxer); +extern int demux_open_vqf(demuxer_t* demuxer); #ifdef HAVE_MATROSKA extern int demux_mkv_open(demuxer_t *demuxer); #endif @@ -809,6 +816,18 @@ if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_REALAUDIO){ } } +//=============== Try to open as VQF file: ================= +if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_VQF){ + demuxer=new_demuxer(stream,DEMUXER_TYPE_VQF,audio_id,video_id,dvdsub_id); + if(demux_probe_vqf(demuxer)){ + mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"VQF"); + file_format=DEMUXER_TYPE_VQF; + } else { + free_demuxer(demuxer); + demuxer = NULL; + } +} + //=============== Try based on filename EXTENSION: ================= // Ok. We're over the stable detectable fileformats, the next ones are a bit // fuzzy. So by default (extension_parsing==1) try extension-based detection @@ -1355,6 +1374,10 @@ switch(file_format){ if (!demux_open_ra(demuxer)) return NULL; break; } + case DEMUXER_TYPE_VQF: { + if (!demux_open_vqf(demuxer)) return NULL; + break; + } #ifdef USE_LIBAVFORMAT case DEMUXER_TYPE_LAVF: { if (!demux_open_lavf(demuxer)) return NULL; @@ -1474,6 +1497,7 @@ extern void demux_rawaudio_seek(demuxer_t *demuxer,float rel_seek_secs,int flags extern void demux_rawvideo_seek(demuxer_t *demuxer,float rel_seek_secs,int flags); extern void demux_xmms_seek(demuxer_t *demuxer,float rel_seek_secs,int flags); extern void demux_mkv_seek(demuxer_t *demuxer,float rel_seek_secs,int flags); +extern void demux_seek_vqf(demuxer_t *demuxer,float rel_seek_secs,int flags); int demux_seek(demuxer_t *demuxer,float rel_seek_secs,int flags){ demux_stream_t *d_audio=demuxer->audio; @@ -1576,6 +1600,8 @@ switch(demuxer->file_format){ case DEMUXER_TYPE_LAVF: demux_seek_lavf(demuxer,rel_seek_secs,flags); break; #endif + case DEMUXER_TYPE_VQF: + demux_seek_vqf(demuxer,rel_seek_secs,flags); break; } // switch(demuxer->file_format) diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h index 2d1b465ee8..4153721772 100644 --- a/libmpdemux/demuxer.h +++ b/libmpdemux/demuxer.h @@ -44,11 +44,12 @@ #define DEMUXER_TYPE_LMLM4 34 #define DEMUXER_TYPE_LAVF 35 #define DEMUXER_TYPE_NSV 36 +#define DEMUXER_TYPE_VQF 37 // This should always match the higest demuxer type number. // Unless you want to disallow users to force the demuxer to some types #define DEMUXER_TYPE_MIN 0 -#define DEMUXER_TYPE_MAX 36 +#define DEMUXER_TYPE_MAX 37 #define DEMUXER_TYPE_DEMUXERS (1<<16) // A virtual demuxer type for the network code |