bugfix.notes

4.8kcelp语音压缩编码程序

  c
! 	  call postfilt(vdecoded(k),l,alpha,beta,ip,op,dp1,dp2,dp3,dp4)
  canaly	  call postfilt(v(k),l,alpha,beta,ip,op,dp1,dp2,dp3,dp4)
  clocomp	  call postfilt2(vdecoded(k),l,alpha,beta,ip,op,dp1,dp2,dp3,dp4)
  c
--- 951,957 ----
  c
  c	      *** post filtering
  c
! 	  call postfilt2(vdecoded(k),l,alpha,beta,ip,op,dp1,dp2,dp3,dp4)
  canaly	  call postfilt(v(k),l,alpha,beta,ip,op,dp1,dp2,dp3,dp4)
  clocomp	  call postfilt2(vdecoded(k),l,alpha,beta,ip,op,dp1,dp2,dp3,dp4)
  c
*** celp32/cli.f	Mon Oct 26 17:19:37 1992
--- ../celp-1016/celp32/cli.F	Wed Mar 10 20:28:50 1993
***************
*** 152,158 ****
  c
  c	note:  ncsize, no, and gamma are passed through common
  c
- 	implicit undefined(a-z)
  	include 'ccsub.com'
  convex  #include "ccsub.com"
  	character*80 ifile, ofile, stype*10
--- 152,157 ----
***************
*** 174,180 ****
  	logical flag, qflag
  c
  	data switch /'-i','-o', '-p', '-q', '-m', '-l', '-c'/
! 	data pfile /''/, qfile /''/, mfile /''/, lfile /'celp.log'/
  	data type /'cbgain', 'pitch', 'spectrum'/
  	data qtype /'kang','log','max2','arcsin','none'/
  c
--- 173,179 ----
  	logical flag, qflag
  c
  	data switch /'-i','-o', '-p', '-q', '-m', '-l', '-c'/
! 	data pfile /' '/, qfile /' '/, mfile /' '/, lfile /'celp.log'/
  	data type /'cbgain', 'pitch', 'spectrum'/
  	data qtype /'kang','log','max2','arcsin','none'/
  c
***************
*** 225,232 ****
  c	*** read input parameter file if requested
  c           (all parameters are required)
  c
! 	if (pfile .ne. '') then
  	   open(unit=69, file=pfile)
  	   read(69, *) ncsize 
  	   read(69, *) l
  	   read(69, *) ll
--- 224,235 ----
  c	*** read input parameter file if requested
  c           (all parameters are required)
  c
! 	if (pfile .ne. ' ') then
! #ifdef ultrix
! 	   open(unit=69, file=pfile, status='OLD', readonly)
! #else
  	   open(unit=69, file=pfile)
+ #endif
  	   read(69, *) ncsize 
  	   read(69, *) l
  	   read(69, *) ll
***************
*** 243,257 ****
  	   if (mxsw2 .ne. 1) mxsw = .false.
  c
  	   read(69, *) prewt
! 	   read(69, *) pstype
  	   close(unit=69)
  	end if
  c
  c	*** read quantization characteristics file if requested
  c           (not all parameters are required)
  c
! 	if (qfile .ne. '') then
  	   open(unit=70, file=qfile)
  	   do 300 i = 1, maxtype
  	      read(70, 69) temp
  69	      format(a)
--- 246,264 ----
  	   if (mxsw2 .ne. 1) mxsw = .false.
  c
  	   read(69, *) prewt
! 	   read(69, '(A)') pstype
  	   close(unit=69)
  	end if
  c
  c	*** read quantization characteristics file if requested
  c           (not all parameters are required)
  c
! 	if (qfile .ne. ' ') then
! #ifdef ultrix
! 	   open(unit=70, file=qfile, status='OLD', readonly)
! #else
  	   open(unit=70, file=qfile)
+ #endif
  	   do 300 i = 1, maxtype
  	      read(70, 69) temp
  69	      format(a)
***************
*** 299,306 ****
  c
  c	*** read bit error characteristics file if requested
  c
! 	if (mfile .ne. '') then
  	   open(unit=72, file=mfile)
  	   do 74 i = 1, bits
  	      read(72, 73) mask(i)
  73	      format(i1)
--- 306,317 ----
  c
  c	*** read bit error characteristics file if requested
  c
! 	if (mfile .ne. ' ') then
! #ifdef ultrix
! 	   open(unit=72, file=mfile, status='OLD', readonly)
! #else
  	   open(unit=72, file=mfile)
+ #endif
  	   do 74 i = 1, bits
  	      read(72, 73) mask(i)
  73	      format(i1)
***************
*** 397,408 ****
--- 408,427 ----
  	if (lfile .ne. 'none') then  
  	   if (lfile .eq. 'celp.log') then
  cvax	      open(unit=71, file=lfile, access='append')
+ #ifdef ultrix
+ 	      open(unit=71, file=lfile, status='UNKNOWN')
+ #else
  	      open(unit=71, file=lfile)
+ #endif
  601	      read(71, 69, end=602) temp
  	      goto 601
  602	      continue	
  	   else
+ #ifdef ultrix
+ 	      open(unit=71, file=lfile, status='NEW')
+ #else
  	      open(unit=71, file=lfile)
+ #endif
  	   end if
  	   write(71, *) getlog(), host, fdate()
  	   write(71, *)'          Program: '//prog(1:lnblnk(prog))
*** celp32/iodisk.f	Mon Oct 26 17:19:42 1992
--- ../celp-1016/celp32/iodisk.F	Fri Mar 12 11:11:33 1993
***************
*** 41,47 ****
  C**************************************************************************
  C*-
  	function iodisk(mode, lun, fname, nrec, iar, size)
! 	implicit undefined(a-z)
  	integer mode, lun, nrec, size, iodisk
  	integer*2 iar(size)    
  	character*(*) fname
--- 41,47 ----
  C**************************************************************************
  C*-
  	function iodisk(mode, lun, fname, nrec, iar, size)
! 
  	integer mode, lun, nrec, size, iodisk
  	integer*2 iar(size)    
  	character*(*) fname
***************
*** 68,81 ****
--- 68,93 ----
  	   nrec = nrec+1
  	else if (mode .eq. 3) then
  c					*open file for read
+ #ifdef ultrix
+ 	   if (mod(size,2).ne.0) stop 'frame size must be even'
  	   open(lun, file=fname, access='direct', status='old',
+      +	        recl=size/2, readonly, err=333)
+ #else
+ 	   open(lun, file=fname, access='direct', status='old',
       +	        recl=2*size, err=333)
+ #endif
  	else if (mode .eq. 4) then
  c					*open file for write
  c					*unlink = UNIX file delete
  	   call unlink(fname)
+ #ifdef ultrix
+ 	   if (mod(size,2).ne.0) stop 'frame size must be even'
+ 	   open(lun, file=fname, access='direct', status='new',
+      +	        recl=size/2, err=444)
+ #else
  	   open(lun, file=fname, access='direct', status='new',
       +	        recl=2*size, err=444)
+ #endif
  	else if (mode .eq. -1) then
  c					*close file
  	   close(lun, err=555)
*** celp32/psearch.f	Mon Oct 26 17:19:50 1992
--- ../celp-1016/celp32/psearch.F	Wed Mar 10 20:33:25 1993
***************
*** 83,89 ****
  C**************************************************************************
  C*-
  	subroutine psearch(s, l)
! 	implicit undefined (a-z)
  	integer l
  	real s(l)
  	include 'ccsub.com'
--- 83,89 ----
  C**************************************************************************
  C*-
  	subroutine psearch(s, l)
! 
  	integer l
  	real s(l)
  	include 'ccsub.com'
***************
*** 102,107 ****
--- 102,110 ----
  	real v0(maxbufptr), v0shift(maxlp), frac
  c			*length of truncated impulse response
  	parameter (len = 30)
+ 	save oldptr, submult
+ c
+ 	data oldptr/1/
  c
  c	Choose type of pitch delay search:
  c
***************
*** 132,146 ****
  	   stop ' psearch: incorrect pitch search type (pstype)'
  	end if
  c
- 	save oldptr, submult
- c
- 	data oldptr/1/
  c
  c
  	if (len .gt. l) stop ' psearch:  impulse response too long'
  c
  	bufptr = mmax+no+2*l+maxnp-1
! 	if (maxlp .lt. maxl) stop ' psearch:  maxlp < maxl'
  #ifdef SUNGRAPH
  c			*save impulse response in file 'pitch'
  	call save_sg(pitch_ir_vid,h,l,'save pitch_ir_vid')
--- 135,146 ----
  	   stop ' psearch: incorrect pitch search type (pstype)'
  	end if
  c
  c
  c
  	if (len .gt. l) stop ' psearch:  impulse response too long'
  c
  	bufptr = mmax+no+2*l+maxnp-1
! 
  #ifdef SUNGRAPH
  c			*save impulse response in file 'pitch'
  	call save_sg(pitch_ir_vid,h,l,'save pitch_ir_vid')
***************
*** 159,165 ****
--- 159,170 ----
  	   bb(3) = 0.0
  	   bb(1) = mmin
  c			*load pitch submultiple delay table
+ #ifdef ultrix
+ 	   open(unit=8, file='./submult.h', status='old', err=22,
+      -	        readonly)
+ #else
  	   open(unit=8, file='./submult.h', status='old', err=22)
+ #endif
  	   do 20 i = 0, maxpd-1
  	      read(8, *, err=22) (submult(i,j), j=0,3)
  20	   continue