Commit 3b6ac4d6 authored by mmu_man's avatar mmu_man

cleanup; BSoundRecorder moved to Experimental namespace


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@1960 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent d5e025df
...@@ -33,6 +33,7 @@ extern "C" { ...@@ -33,6 +33,7 @@ extern "C" {
#ifdef HAVE_BSOUNDRECORDER #ifdef HAVE_BSOUNDRECORDER
#include <SoundRecorder.h> #include <SoundRecorder.h>
using namespace BPrivate::Media::Experimental;
#endif #endif
/* enable performance checks */ /* enable performance checks */
...@@ -42,7 +43,6 @@ extern "C" { ...@@ -42,7 +43,6 @@ extern "C" {
//#define LATENCY_CHECK //#define LATENCY_CHECK
#define AUDIO_BLOCK_SIZE 4096 #define AUDIO_BLOCK_SIZE 4096
//#define AUDIO_BLOCK_SIZE 2048
#define AUDIO_BLOCK_COUNT 8 #define AUDIO_BLOCK_COUNT 8
#define AUDIO_BUFFER_SIZE (AUDIO_BLOCK_SIZE*AUDIO_BLOCK_COUNT) #define AUDIO_BUFFER_SIZE (AUDIO_BLOCK_SIZE*AUDIO_BLOCK_COUNT)
...@@ -60,7 +60,6 @@ typedef struct { ...@@ -60,7 +60,6 @@ typedef struct {
int input_index; int input_index;
sem_id output_sem; sem_id output_sem;
int output_index; int output_index;
int queued;
BSoundPlayer *player; BSoundPlayer *player;
#ifdef HAVE_BSOUNDRECORDER #ifdef HAVE_BSOUNDRECORDER
BSoundRecorder *recorder; BSoundRecorder *recorder;
...@@ -196,7 +195,6 @@ static int audio_open(AudioData *s, int is_output, const char *audio_device) ...@@ -196,7 +195,6 @@ static int audio_open(AudioData *s, int is_output, const char *audio_device)
return -EIO; /* not for now */ return -EIO; /* not for now */
#endif #endif
s->input_sem = create_sem(AUDIO_BUFFER_SIZE, "ffmpeg_ringbuffer_input"); s->input_sem = create_sem(AUDIO_BUFFER_SIZE, "ffmpeg_ringbuffer_input");
// s->input_sem = create_sem(AUDIO_BLOCK_SIZE, "ffmpeg_ringbuffer_input");
if (s->input_sem < B_OK) if (s->input_sem < B_OK)
return -EIO; return -EIO;
s->output_sem = create_sem(0, "ffmpeg_ringbuffer_output"); s->output_sem = create_sem(0, "ffmpeg_ringbuffer_output");
...@@ -206,7 +204,6 @@ static int audio_open(AudioData *s, int is_output, const char *audio_device) ...@@ -206,7 +204,6 @@ static int audio_open(AudioData *s, int is_output, const char *audio_device)
} }
s->input_index = 0; s->input_index = 0;
s->output_index = 0; s->output_index = 0;
s->queued = 0;
create_bapp_if_needed(); create_bapp_if_needed();
s->frame_size = AUDIO_BLOCK_SIZE; s->frame_size = AUDIO_BLOCK_SIZE;
/* bump up the priority (avoid realtime though) */ /* bump up the priority (avoid realtime though) */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment