diff options
| author | rtognimp <rtognimp@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-04-30 19:45:34 +0000 |
|---|---|---|
| committer | rtognimp <rtognimp@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-04-30 19:45:34 +0000 |
| commit | d415a3d3ff040eb3e30a076dfbe78c58b5ad837f (patch) | |
| tree | cf5d935bad02a03963a32334ecf71eba6d3f3fe9 /libmpcodecs | |
| parent | 19c264135c4e6591812b6a71672bb548009b21e2 (diff) | |
| download | mpv-d415a3d3ff040eb3e30a076dfbe78c58b5ad837f.tar.bz2 mpv-d415a3d3ff040eb3e30a076dfbe78c58b5ad837f.tar.xz | |
Support for codec 14_4 and 28_8
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10031 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/ad_realaud.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/libmpcodecs/ad_realaud.c b/libmpcodecs/ad_realaud.c index 28411326ae..01c387fe8a 100644 --- a/libmpcodecs/ad_realaud.c +++ b/libmpcodecs/ad_realaud.c @@ -136,7 +136,7 @@ static int load_syms_linux(char *path) raSetDLLAccessPath = dlsym(handle, "SetDLLAccessPath"); raSetPwd = dlsym(handle, "RASetPwd"); // optional, used by SIPR - if (raCloseCodec && raDecode && raFlush && raFreeDecoder && + if (raCloseCodec && raDecode && /*raFlush && */raFreeDecoder && raGetFlavorProperty && (raOpenCodec||raOpenCodec2) && raSetFlavor && /*raSetDLLAccessPath &&*/ raInitDecoder) { @@ -398,12 +398,26 @@ static int decode_audio(sh_audio_t *sh,unsigned char *buf,int minlen,int maxlen) int sps=((short*)(sh->wf+1))[0]; int w=sh->wf->nBlockAlign; // 5 int h=((short*)(sh->wf+1))[1]; + int cfs=((short*)(sh->wf+1))[3]; // printf("bs=%d sps=%d w=%d h=%d \n",sh->wf->nBlockAlign,sps,w,h); #if 1 if(sh->a_in_buffer_len<=0){ // fill the buffer! + if (sh->format == mmioFOURCC('1','4','_','4')) { + demux_read_data(sh->ds, sh->a_in_buffer, sh->wf->nBlockAlign); + sh->a_in_buffer_size= + sh->a_in_buffer_len=sh->wf->nBlockAlign; + } else + if (sh->format == mmioFOURCC('2','8','_','8')) { + int i,j; + for (j = 0; j < h; j++) + for (i = 0; i < h/2; i++) + demux_read_data(sh->ds, sh->a_in_buffer+i*2*w+j*cfs, cfs); + sh->a_in_buffer_size= + sh->a_in_buffer_len=sh->wf->nBlockAlign*h; + } else if(!sps){ // 'sipr' way int j,n; |