[Mplayer-cvslog] CVS: main codec-cfg.c,1.15,1.16 dec_audio.c,1.4,1.5 mplayer.c,1.55,1.56

[GEREOFFY]

Update of /cvsroot/mplayer/main
In directory usw-pr-cvs1:/tmp/cvs-serv24079

Modified Files:
	codec-cfg.c dec_audio.c mplayer.c 
Log Message:
DVD PCM audio support

Index: codec-cfg.c
===================================================================
RCS file: /cvsroot/mplayer/main/codec-cfg.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** codec-cfg.c	2001/04/11 20:55:14	1.15
--- codec-cfg.c	2001/04/14 15:25:10	1.16
***************
*** 202,205 ****
--- 202,206 ----
  		"msgsm",
  		"dshow",
+ 		"dvdpcm",
  		NULL
  	};

Index: dec_audio.c
===================================================================
RCS file: /cvsroot/mplayer/main/dec_audio.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** dec_audio.c	2001/04/11 01:38:56	1.4
--- dec_audio.c	2001/04/14 15:25:10	1.5
***************
*** 6,10 ****
  sh_audio->samplesize=2;
  sh_audio->samplerate=0;
! sh_audio->pcm_bswap=0;
  
  sh_audio->a_buffer_size=16384;  // default size, maybe not enough for Win32/ACM
--- 6,10 ----
  sh_audio->samplesize=2;
  sh_audio->samplerate=0;
! //sh_audio->pcm_bswap=0;
  
  sh_audio->a_buffer_size=16384;  // default size, maybe not enough for Win32/ACM
***************
*** 64,68 ****
  }
  case 2: {
- //  if(file_format==DEMUXER_TYPE_AVI){    // FIXME!!!!!!!
      // AVI PCM Audio:
      WAVEFORMATEX *h=&sh_audio->wf;
--- 64,67 ----
***************
*** 70,79 ****
      sh_audio->samplerate=h->nSamplesPerSec;
      sh_audio->samplesize=(h->wBitsPerSample+7)/8;
! //  } else {
! //    // DVD PCM audio:
! //    sh_audio->channels=2;
! //    sh_audio->samplerate=48000;
  //    sh_audio->pcm_bswap=1;
- //  }
      break;
  }
--- 69,79 ----
      sh_audio->samplerate=h->nSamplesPerSec;
      sh_audio->samplesize=(h->wBitsPerSample+7)/8;
!     break;
! }
! case 8: {
!     // DVD PCM Audio:
!     sh_audio->channels=2;
!     sh_audio->samplerate=48000;
  //    sh_audio->pcm_bswap=1;
      break;
  }
***************
*** 150,157 ****
          sh_audio->channels=2; // hack
          break;
!       case 2: // PCM
        { len=demux_read_data(sh_audio->ds,buf,OUTBURST);
!         if(sh_audio->pcm_bswap){
!           int j;
            //if(i&1){ printf("Warning! pcm_audio_size&1 !=0  (%d)\n",i);i&=~1; }
            for(j=0;j<len;j+=2){
--- 150,160 ----
          sh_audio->channels=2; // hack
          break;
!       case 2: // AVI PCM
        { len=demux_read_data(sh_audio->ds,buf,OUTBURST);
!         break;
!       }
!       case 8: // DVD PCM
!       { int j;
!         len=demux_read_data(sh_audio->ds,buf,OUTBURST);
            //if(i&1){ printf("Warning! pcm_audio_size&1 !=0  (%d)\n",i);i&=~1; }
            for(j=0;j<len;j+=2){
***************
*** 160,164 ****
              buf[j+1]=x;
            }
-         }
          break;
        }
--- 163,166 ----

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -r1.55 -r1.56
*** mplayer.c	2001/04/14 03:12:06	1.55
--- mplayer.c	2001/04/14 15:25:10	1.56
***************
*** 729,733 ****
      switch(d_audio->type){
        case 1: sh_audio->format=0x50;break; // mpeg
!       case 2: sh_audio->format=0x2;break;  // pcm
        case 3: sh_audio->format=0x2000;break; // ac3
        default: has_audio=0; // unknown type
--- 729,733 ----
      switch(d_audio->type){
        case 1: sh_audio->format=0x50;break; // mpeg
!       case 2: sh_audio->format=0x10001;break;  // dvd pcm
        case 3: sh_audio->format=0x2000;break; // ac3
        default: has_audio=0; // unknown type


_______________________________________________
Mplayer-cvslog mailing list
Mplayer-cvslog at lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog