From 9567fc9b2dab3b8fb0f9c2115cd5ef9d2ea304cd Mon Sep 17 00:00:00 2001 From: Roman Bazalevsky Date: Fri, 11 Jul 2014 19:52:32 +0400 Subject: [PATCH] Added stdin source (to use with 'arecord -t raw' command for 16-bit audio) --- oss-streamer | Bin 12099 -> 12327 bytes oss-streamer.c | 13 ++++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/oss-streamer b/oss-streamer index deb0d96216beaa546dda6bb1d7f217688adbdca0..ceabc2e898569ffcf81c4b715e07515fc5578253 100755 GIT binary patch literal 12327 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 literal 12099 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 diff --git a/oss-streamer.c b/oss-streamer.c index c5702d4..a64a166 100644 --- a/oss-streamer.c +++ b/oss-streamer.c @@ -15,7 +15,6 @@ #include #define SOURCE_VERSION "0.0" -#define BOUNDARY "arflebarfle" typedef enum { SNAPSHOT, STREAM } answer_t; @@ -23,7 +22,7 @@ typedef enum { SNAPSHOT, STREAM } answer_t; int stop=0, sd; int force_delay=0; #define BUF_SIZE 4096 -int source_dev; +FILE *source_dev; /* signal fresh frames */ pthread_mutex_t db = PTHREAD_MUTEX_INITIALIZER; @@ -97,7 +96,7 @@ void *get_thread( void *arg ) { while( !stop ) { /* grab a frame */ - if( read(source_dev,rbuffer,BUF_SIZE) < 0 ) { + if( fread(rbuffer,1,BUF_SIZE,source_dev) < 0 ) { fprintf(stderr, "Error grabbing\n"); exit(1); } @@ -281,8 +280,12 @@ int main(int argc, char *argv[]) /* allocate audio datastructure */ /* open video device and prepare data structure */ - source_dev = open(dev,O_RDONLY); - if (source_dev < 0) { + if (strcmp(dev,"stdin")==0) { + source_dev = stdin; + } else { + source_dev = fopen(dev,"r"); + } + if (source_dev == NULL) { fprintf(stderr, "error opening source device\n"); exit(1); } -- 2.34.1