[PATCH] update for TOOLS/c (was: Re: [MPlayer-dev-eng] documentation of TOOLS directory)
VMiklos
mamajom at axelero.hu
Fri Jul 30 13:09:54 CEST 2004
On Fri, 30 Jul 2004, Arpi wrote:
> > first, here is a trivial patch:
> > - removes entry for obsoloted subreader.c
> > - adds an entry for audio-block2.c, as currently it is not handeld by "c"
> >
> > btw what's the diffecence between audio-block2.c and audio-block.c?
> > why should we store audio-block.c as it is only an older version of
> > audio-block2.c?
>
>
> i think the TOOLS dir needs a big cleanup.
> the audio-block* files were made by me to test some oss ioctl bug
> (actually bug in soundcard drivers, not the oss api/core), many
> tears ago. now these bugs are workarounded in ao_oss, and are
> fixed in most drivers anyway. these files may be deleted...
so here is an updated version:
- removes entry for obsoloted subreader.c and audio-block.c
- removes audio-block.c and audio-block2.c
udv / greetings
--
__________ VMiklos / FrugalWare & EL Team
____/__/___|___\__. E-mail: mamajom at axelero dot hu
O__O _ | | _ | Homepage: http://www.vmiklos.tk
'--`-(_)'---'--(_)-' gpg --keyserver pgp.mit.edu --recv-keys 03915096
-------------- next part --------------
diff -Naur main.orig/TOOLS/audio-block2.c main/TOOLS/audio-block2.c
--- main.orig/TOOLS/audio-block2.c 2001-05-10 15:20:56.000000000 +0200
+++ main/TOOLS/audio-block2.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,99 +0,0 @@
-// This small util discovers your audio driver's behaviour
-
-//#define OUTBURST 512
-//#define OUTBURST 4096
-#define MAX_OUTBURST 32768
-
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <sys/soundcard.h>
-
-#include <sys/time.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-
-// Returns current time in microseconds
-unsigned int GetTimer(){
- struct timeval tv;
- struct timezone tz;
-// float s;
- gettimeofday(&tv,&tz);
-// s=tv.tv_usec;s*=0.000001;s+=tv.tv_sec;
- return (tv.tv_sec*1000000+tv.tv_usec);
-}
-
-static unsigned char a_buffer[MAX_OUTBURST];
-
-void inline print_info(int audio_fd){
-#if 1
- audio_buf_info zz;
- ioctl(audio_fd, SNDCTL_DSP_GETOSPACE, &zz);
- printf("Status: %3d/%d (%d byte/frag) free: %6d\n",
- zz.fragments, zz.fragstotal, zz.fragsize, zz.bytes);
-#endif
-}
-
-int main(){
- int audio_buffer_size=0;
- int r;
- int xxx=1024*2;
- int audio_fd;
- char *dsp="/dev/dsp";
- unsigned int t0,t1,t2;
- int outburst;
-
- audio_fd=open(dsp, O_WRONLY);
- if(audio_fd<0){
- printf("Can't open audio device %s\n",dsp);
- return 1;
- }
-
-// ioctl(audio_fd, SNDCTL_DSP_RESET, NULL);
-
-// ioctl(audio_fd, SNDCTL_DSP_RESET, NULL);
-
- r=AFMT_S16_LE;ioctl (audio_fd, SNDCTL_DSP_SETFMT, &r);
- r=1; ioctl (audio_fd, SNDCTL_DSP_STEREO, &r);
- r=44100; if(ioctl (audio_fd, SNDCTL_DSP_SPEED, &r)==-1)
- printf("audio_setup: your card doesn't support %d Hz samplerate\n",r);
-
- r=0; ioctl (audio_fd, SNDCTL_DSP_GETBLKSIZE, &r);
- printf("fragment size = %d\n",r);
- outburst=r; if(outburst>4096) outburst=4096;
-
- print_info(audio_fd);
-
- t0=t1=GetTimer();
-
-while(xxx-->0){
- char c='B';
- fd_set rfds;
- struct timeval tv;
- FD_ZERO(&rfds); FD_SET(audio_fd,&rfds);
- tv.tv_sec=0; tv.tv_usec = 0;
-// if(select(audio_fd+1, NULL, &rfds, NULL, &tv)) c=' ';
-
- print_info(audio_fd);
-
- r=0; ioctl (audio_fd, SNDCTL_DSP_GETODELAY, &r); printf("delay = %d\n",r);
-
- r=write(audio_fd,a_buffer,outburst);
- t2=GetTimer();
- if(r<0) printf("Error writting to device\n"); else
- if(r==0) printf("EOF writting to device???\n"); else {
- printf("%c %6.3f %6.3f [%6d] writting %3d of %3d bytes in %7d us\n",c,
- (float)audio_buffer_size/(44100.0f*4.0f),(float)(t1-t0)*0.000001f,
- audio_buffer_size,r,outburst,t2-t1);
- audio_buffer_size+=r;
- }
- t1=t2;
-}
-
-close(audio_fd);
-
-return 0;
-}
-
diff -Naur main.orig/TOOLS/audio-block.c main/TOOLS/audio-block.c
--- main.orig/TOOLS/audio-block.c 2001-03-17 00:05:01.000000000 +0100
+++ main/TOOLS/audio-block.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,62 +0,0 @@
-// This small util discovers your audio driver's behaviour
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <sys/soundcard.h>
-
-#include <sys/time.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-#define OUTBURST 256
-
-// Returns current time in microseconds
-unsigned int GetTimer(){
- struct timeval tv;
- struct timezone tz;
-// float s;
- gettimeofday(&tv,&tz);
-// s=tv.tv_usec;s*=0.000001;s+=tv.tv_sec;
- return (tv.tv_sec*1000000+tv.tv_usec);
-}
-
-static unsigned char a_buffer[OUTBURST];
-
-int main(){
- int audio_buffer_size=0;
- int r;
- int xxx=1024*2;
- int audio_fd;
- char *dsp="/dev/dsp";
- unsigned int t1,t2;
-
- audio_fd=open(dsp, O_WRONLY);
- if(audio_fd<0){
- printf("Can't open audio device %s\n",dsp);
- return 1;
- }
-
- r=AFMT_S16_LE;ioctl (audio_fd, SNDCTL_DSP_SETFMT, &r);
- r=1; ioctl (audio_fd, SNDCTL_DSP_STEREO, &r);
- r=44100; if(ioctl (audio_fd, SNDCTL_DSP_SPEED, &r)==-1)
- printf("audio_setup: your card doesn't support %d Hz samplerate\n",r);
-
- t1=GetTimer();
-
-while(xxx-->0){
- r=write(audio_fd,a_buffer,OUTBURST);
- t2=GetTimer();
- if(r<0) printf("Error writting to device\n"); else
- if(r==0) printf("EOF writting to device???\n"); else {
- printf("[%6d] writting %3d of %3d bytes in %7d us\n",audio_buffer_size,r,OUTBURST,t2-t1);
- audio_buffer_size+=r;
- }
- t1=t2;
-}
-
-close(audio_fd);
-
-return 0;
-}
-
diff -Naur main.orig/TOOLS/c main/TOOLS/c
--- main.orig/TOOLS/c 2001-10-22 09:42:08.000000000 +0200
+++ main/TOOLS/c 2004-07-30 13:07:59.000000000 +0200
@@ -1,10 +1,8 @@
gcc bios2dump.c -o bios2dump
gcc mem2dump.c -o mem2dump
-gcc subreader.c -o subreader
gcc movinfo.c -o movinfo
gcc audio-select.c -o audio-select
-gcc audio-block.c -o audio-block
gcc png2raw.c -o png2raw -lpng
More information about the MPlayer-dev-eng
mailing list