[xiph-cvs] cvs commit: vorbis/examples chaining_example.c decoder_example.c encoder_example.c seeking_example.c vorbisfile_example.c
Chris Wolf
cwolf at xiph.org
Sun Sep 16 18:06:20 PDT 2001
cwolf 01/09/16 18:06:19
Modified: examples chaining_example.c decoder_example.c
encoder_example.c seeking_example.c
vorbisfile_example.c
Log:
Rollback unnecessary file name features.
Revision Changes Path
1.13 +8 -30 vorbis/examples/chaining_example.c
Index: chaining_example.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/examples/chaining_example.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- chaining_example.c 2001/09/15 04:47:47 1.12
+++ chaining_example.c 2001/09/17 01:06:18 1.13
@@ -11,7 +11,7 @@
********************************************************************
function: illustrate simple use of chained bitstream and vorbisfile.a
- last mod: $Id: chaining_example.c,v 1.12 2001/09/15 04:47:47 cwolf Exp $
+ last mod: $Id: chaining_example.c,v 1.13 2001/09/17 01:06:18 cwolf Exp $
********************************************************************/
@@ -23,10 +23,8 @@
#include <fcntl.h>
#endif
-int main(int argc, char *argv[]){
+int main(){
OggVorbis_File ov;
- char msg[256];
- FILE *fpin=NULL;
int i;
#ifdef _WIN32 /* We need to set stdin/stdout to binary mode. Damn windows. */
@@ -36,22 +34,8 @@
_setmode( _fileno( stdout ), _O_BINARY );
#endif
- /* If command line args were supplied, open the named file(s)
- for i/o, else maintain use of stdin/stdout.*/
- if (argc == 2)
- {
- if ((fpin = fopen(argv[1], "rb")) == (FILE*)NULL)
- {
- (void)sprintf(msg, "Can't open \"%s\" for input", argv[1]);
- perror(msg);
- return 1;
- }
- }
- else
- fpin = stdin;
-
/* open the file/pipe on stdin */
- if(ov_open(fpin,&ov,NULL,-1)<0){
+ if(ov_open(stdin,&ov,NULL,-1)<0){
printf("Could not open input as an OggVorbis file.\n\n");
exit(1);
}
@@ -59,33 +43,27 @@
/* print details about each logical bitstream in the input */
if(ov_seekable(&ov)){
printf("Input bitstream contained %ld logical bitstream section(s).\n",
- ov_streams(&ov));
+ ov_streams(&ov));
printf("Total bitstream playing time: %ld seconds\n\n",
- (long)ov_time_total(&ov,-1));
+ (long)ov_time_total(&ov,-1));
}else{
printf("Standard input was not seekable.\n"
- "First logical bitstream information:\n\n");
+ "First logical bitstream information:\n\n");
}
for(i=0;i<ov_streams(&ov);i++){
vorbis_info *vi=ov_info(&ov,i);
printf("\tlogical bitstream section %d information:\n",i+1);
printf("\t\t%ldHz %d channels bitrate %ldkbps serial number=%ld\n",
- vi->rate,vi->channels,ov_bitrate(&ov,i)/1000,
- ov_serialnumber(&ov,i));
+ vi->rate,vi->channels,ov_bitrate(&ov,i)/1000,
+ ov_serialnumber(&ov,i));
printf("\t\theader length: %ld bytes\n",(long)
- (ov.dataoffsets[i]-ov.offsets[i]));
+ (ov.dataoffsets[i]-ov.offsets[i]));
printf("\t\tcompressed length: %ld bytes ",(long)(ov_raw_total(&ov,i)));
printf(" play time: %lds\n",(long)ov_time_total(&ov,i));
}
ov_clear(&ov);
-
- if (argc == 2)
- {
- (void)fclose(fpin);
- }
-
return 0;
}
1.22 +4 -31 vorbis/examples/decoder_example.c
Index: decoder_example.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/examples/decoder_example.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- decoder_example.c 2001/09/15 04:47:48 1.21
+++ decoder_example.c 2001/09/17 01:06:18 1.22
@@ -11,7 +11,7 @@
********************************************************************
function: simple example decoder
- last mod: $Id: decoder_example.c,v 1.21 2001/09/15 04:47:48 cwolf Exp $
+ last mod: $Id: decoder_example.c,v 1.22 2001/09/17 01:06:18 cwolf Exp $
********************************************************************/
@@ -53,9 +53,6 @@
char *buffer;
int bytes;
- FILE *fpin=NULL;
- FILE *fpout=NULL;
- char msg[512];
#ifdef _WIN32 /* We need to set stdin/stdout to binary mode. Damn windows. */
/* Beware the evil ifdef. We avoid these where we can, but this one we
@@ -70,29 +67,6 @@
/* this also lets the user set stdin and stdout */
#endif
- /* If command line args were supplied, open the named file(s)
- for i/o, else maintain use of stdin/stdout.*/
- if (argc == 3)
- {
- if ((fpin = fopen(argv[1], "rb")) == (FILE*)NULL)
- {
- (void)sprintf(msg, "Can't open %s for reading.", argv[1]);
- perror(msg);
- return 1;
- }
-
- if ((fpout = fopen(argv[2], "wb")) == (FILE*)NULL)
- {
- (void)sprintf(msg, "Can't open %s for writing.", argv[2]);
- perror(msg);
- return 1;
- }
- }
- else
- {
- fpin = stdin;
- fpout = stdout;
- }
/********** Decode setup ************/
ogg_sync_init(&oy); /* Now we can read pages */
@@ -108,7 +82,7 @@
/* submit a 4k block to libvorbis' Ogg layer */
buffer=ogg_sync_buffer(&oy,4096);
- bytes=fread(buffer,1,4096,fpin);
+ bytes=fread(buffer,1,4096,stdin);
ogg_sync_wrote(&oy,bytes);
/* Get the first page. */
@@ -191,7 +165,7 @@
}
/* no harm in not checking before adding more */
buffer=ogg_sync_buffer(&oy,4096);
- bytes=fread(buffer,1,4096,fpin);
+ bytes=fread(buffer,1,4096,stdin);
if(bytes==0 && i<2){
fprintf(stderr,"End of file before finding all Vorbis headers!\n");
exit(1);
@@ -287,7 +261,7 @@
fprintf(stderr,"Clipping in frame %ld\n",(long)(vd.sequence));
- fwrite(convbuffer,2*vi.channels,bout,fpout);
+ fwrite(convbuffer,2*vi.channels,bout,stdout);
vorbis_synthesis_read(&vd,bout); /* tell libvorbis how
many samples we
@@ -300,7 +274,7 @@
}
if(!eos){
buffer=ogg_sync_buffer(&oy,4096);
- bytes=fread(buffer,1,4096,fpin);
+ bytes=fread(buffer,1,4096,stdin);
ogg_sync_wrote(&oy,bytes);
if(bytes==0)eos=1;
}
@@ -326,4 +300,3 @@
fprintf(stderr,"Done.\n");
return(0);
}
-
1.25 +14 -39 vorbis/examples/encoder_example.c
Index: encoder_example.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/examples/encoder_example.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- encoder_example.c 2001/09/15 04:47:48 1.24
+++ encoder_example.c 2001/09/17 01:06:18 1.25
@@ -11,7 +11,7 @@
********************************************************************
function: simple example encoder
- last mod: $Id: encoder_example.c,v 1.24 2001/09/15 04:47:48 cwolf Exp $
+ last mod: $Id: encoder_example.c,v 1.25 2001/09/17 01:06:18 cwolf Exp $
********************************************************************/
@@ -24,7 +24,6 @@
#include <stdlib.h>
#include <time.h>
#include <math.h>
-#include <string.h>
#include <vorbis/vorbisenc.h>
#ifdef _WIN32 /* We need the following two to set stdin/stdout to binary */
@@ -39,7 +38,7 @@
#define READ 1024
signed char readbuffer[READ*4+44]; /* out of the data segment, not the stack */
-int main(int argc, char *argv[]){
+int main(){
ogg_stream_state os; /* take physical pages, weld into a logical
stream of packets */
ogg_page og; /* one Ogg bitstream page. Vorbis packets are inside */
@@ -53,18 +52,19 @@
vorbis_block vb; /* local working space for packet->PCM decode */
int eos=0;
- FILE *fpin=NULL;
- FILE *fpout=NULL;
- char msg[512];
int i, founddata;
#if defined(macintosh) && defined(__MWERKS__)
- int ac = 0;
- char **av = NULL;
- ac = ccommand(&av); /* get a "command line" from the Mac user */
- /* this also lets the user set stdin and stdout */
+ int argc = 0;
+ char **argv = NULL;
+ argc = ccommand(&argv); /* get a "command line" from the Mac user */
+ /* this also lets the user set stdin and stdout */
#endif
+ /* we cheat on the WAV header; we just bypass 44 bytes and never
+ verify that it matches 16bit/stereo/44.1kHz. This is just an
+ example, after all. */
+
#ifdef _WIN32 /* We need to set stdin/stdout to binary mode. Damn windows. */
/* Beware the evil ifdef. We avoid these where we can, but this one we
cannot. Don't add any more, you'll probably go to hell if you do. */
@@ -72,30 +72,6 @@
_setmode( _fileno( stdout ), _O_BINARY );
#endif
- /* If command line args were supplied, open the named file(s)
- for i/o, else maintain use of stdin/stdout.*/
- if (argc == 3)
- {
- if ((fpin = fopen(argv[1], "rb")) == (FILE*)NULL)
- {
- (void)sprintf(msg, "Can't open %s for reading.", argv[1]);
- perror(msg);
- return 1;
- }
-
- if ((fpout = fopen(argv[2], "wb")) == (FILE*)NULL)
- {
- (void)sprintf(msg, "Can't open %s for writing.", argv[2]);
- perror(msg);
- return 1;
- }
- }
- else
- {
- fpin = stdin;
- fpout = stdout;
- }
-
/* we cheat on the WAV header; we just bypass the header and never
verify that it matches 16bit/stereo/44.1kHz. This is just an
example, after all. */
@@ -170,15 +146,15 @@
while(!eos){
int result=ogg_stream_flush(&os,&og);
if(result==0)break;
- fwrite(og.header,1,og.header_len,fpout);
- fwrite(og.body,1,og.body_len,fpout);
+ fwrite(og.header,1,og.header_len,stdout);
+ fwrite(og.body,1,og.body_len,stdout);
}
}
while(!eos){
long i;
- long bytes=fread(readbuffer,1,READ*4,fpin); /* stereo hardwired here */
+ long bytes=fread(readbuffer,1,READ*4,stdin); /* stereo hardwired here */
if(bytes==0){
/* end of file. this can be done implicitly in the mainline,
@@ -220,8 +196,8 @@
while(!eos){
int result=ogg_stream_pageout(&os,&og);
if(result==0)break;
- fwrite(og.header,1,og.header_len,fpout);
- fwrite(og.body,1,og.body_len,fpout);
+ fwrite(og.header,1,og.header_len,stdout);
+ fwrite(og.body,1,og.body_len,stdout);
/* this could be set above, but for illustrative purposes, I do
it here (to show that vorbis does know where the stream ends) */
@@ -246,4 +222,3 @@
fprintf(stderr,"Done.\n");
return(0);
}
-
1.10 +2 -18 vorbis/examples/seeking_example.c
Index: seeking_example.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/examples/seeking_example.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- seeking_example.c 2001/09/15 04:47:48 1.9
+++ seeking_example.c 2001/09/17 01:06:18 1.10
@@ -11,7 +11,7 @@
********************************************************************
function: illustrate seeking, and test it too
- last mod: $Id: seeking_example.c,v 1.9 2001/09/15 04:47:48 cwolf Exp $
+ last mod: $Id: seeking_example.c,v 1.10 2001/09/17 01:06:18 cwolf Exp $
********************************************************************/
@@ -19,7 +19,6 @@
#include <stdio.h>
#include "vorbis/codec.h"
#include "vorbis/vorbisfile.h"
-//#include "../lib/misc.h"
#ifdef _WIN32 /* We need the following two to set stdin/stdout to binary */
# include <io.h>
@@ -66,30 +65,15 @@
ogg_int64_t pcmlength;
char *bigassbuffer;
int dummy;
- char msg[256];
- FILE *fpin=NULL;
#ifdef _WIN32 /* We need to set stdin/stdout to binary mode. Damn windows. */
_setmode( _fileno( stdin ), _O_BINARY );
_setmode( _fileno( stdout ), _O_BINARY );
#endif
- /* If command line args were supplied, open the named file(s)
- for i/o, else maintain use of stdin/stdout.*/
- if (argc == 2)
- {
- if ((fpin = fopen(argv[1], "rb")) == (FILE*)NULL)
- {
- (void)sprintf(msg, "Can't open \"%s\" for input", argv[1]);
- perror(msg);
- return 1;
- }
- }
- else
- fpin = stdin;
/* open the file/pipe on stdin */
- if(ov_open(fpin,&ov,NULL,-1)<0){
+ if(ov_open(stdin,&ov,NULL,-1)<0){
printf("Could not open input as an OggVorbis file.\n\n");
exit(1);
}
1.7 +2 -28 vorbis/examples/vorbisfile_example.c
Index: vorbisfile_example.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/examples/vorbisfile_example.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- vorbisfile_example.c 2001/09/15 04:47:48 1.6
+++ vorbisfile_example.c 2001/09/17 01:06:18 1.7
@@ -11,7 +11,7 @@
********************************************************************
function: simple example decoder using vorbisfile
- last mod: $Id: vorbisfile_example.c,v 1.6 2001/09/15 04:47:48 cwolf Exp $
+ last mod: $Id: vorbisfile_example.c,v 1.7 2001/09/17 01:06:18 cwolf Exp $
********************************************************************/
@@ -36,9 +36,6 @@
OggVorbis_File vf;
int eof=0;
int current_section;
- FILE *fpin=NULL;
- FILE *fpout=NULL;
- char msg[512];
#ifdef _WIN32 /* We need to set stdin/stdout to binary mode. Damn windows. */
/* Beware the evil ifdef. We avoid these where we can, but this one we
@@ -47,29 +44,7 @@
_setmode( _fileno( stdout ), _O_BINARY );
#endif
- if (argc == 3)
- {
- if ((fpin = fopen(argv[1], "rb")) == (FILE*)NULL)
- {
- (void)sprintf(msg, "Can't open %s for reading.", argv[1]);
- perror(msg);
- return 1;
- }
-
- if ((fpout = fopen(argv[2], "wb")) == (FILE*)NULL)
- {
- (void)sprintf(msg, "Can't open %s for writing.", argv[2]);
- perror(msg);
- return 1;
- }
- }
- else
- {
- fpin = stdin;
- fpout = stdout;
- }
-
- if(ov_open(fpin, &vf, NULL, 0) < 0) {
+ if(ov_open(stdin, &vf, NULL, 0) < 0) {
fprintf(stderr,"Input does not appear to be an Ogg bitstream.\n");
exit(1);
}
@@ -100,7 +75,7 @@
} else {
/* we don't bother dealing with sample rate changes, etc, but
you'll have to*/
- fwrite(pcmout,1,ret,fpout);
+ fwrite(pcmout,1,ret,stdout);
}
}
@@ -110,4 +85,3 @@
fprintf(stderr,"Done.\n");
return(0);
}
-
--- >8 ----
List archives: http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body. No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.
More information about the commits
mailing list