From 424de0ebbfbaee6b6453044fe1f1fe2b91c2b41d Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Queru Date: Thu, 12 Nov 2009 18:45:38 -0800 Subject: [PATCH] eclair snapshot --- audio/AudioIn/UNIX/src/audioin.c | 2 +- audio/AudioIn/UNIX/src/audioinwrapper.cpp | 20 ++++++++++++-------- srec/ca/acc_basi.c | 5 +++++ .../android_speech_srec_MicrophoneInputStream.cpp | 6 +++--- tools/grxmlcompile/gr_iface.cpp | 1 + tools/grxmlcompile/sub_base.cpp | 1 + tools/grxmlcompile/sub_grph.cpp | 1 + tools/grxmlcompile/sub_min.cpp | 1 + tools/grxmlcompile/sub_supp.cpp | 1 + 9 files changed, 26 insertions(+), 12 deletions(-) diff --git a/audio/AudioIn/UNIX/src/audioin.c b/audio/AudioIn/UNIX/src/audioin.c index 5d20062..9d8a5a9 100644 --- a/audio/AudioIn/UNIX/src/audioin.c +++ b/audio/AudioIn/UNIX/src/audioin.c @@ -38,7 +38,7 @@ /* frame size which is now automatically selected */ /*--------------------------------------------------------------------------*/ -#if !defined(ANDROID) || defined(__ARM_ARCH_5__) +#if !defined(ANDROID) || defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_4__) diff --git a/audio/AudioIn/UNIX/src/audioinwrapper.cpp b/audio/AudioIn/UNIX/src/audioinwrapper.cpp index bf35aa6..9fb46f5 100644 --- a/audio/AudioIn/UNIX/src/audioinwrapper.cpp +++ b/audio/AudioIn/UNIX/src/audioinwrapper.cpp @@ -18,7 +18,7 @@ *---------------------------------------------------------------------------*/ -#if defined(ANDROID) && defined(__ARM_ARCH_5__) +#if defined(ANDROID) && (defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_4__)) //#define USE_DEV_EAC_FILE 1 @@ -27,11 +27,11 @@ #define N_CHANNELS 1 #else #include -#include +#include using namespace android; #endif -#endif // defined(ANDROID) && defined(__ARM_ARCH_5__) +#endif // defined(ANDROID) && (defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_4__)) #include "plog.h" @@ -50,7 +50,7 @@ static struct timeval buffer_save_audio; extern "C" { -#if defined(ANDROID) && defined(__ARM_ARCH_5__) +#if defined(ANDROID) && (defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_4__)) #if defined(USE_DEV_EAC_FILE) static int audiofd = -1; @@ -95,8 +95,12 @@ int AudioOpen(void) #endif // TODO: get record buffer size from hardware. record = new android::AudioRecord( - android::AudioRecord::DEFAULT_INPUT, sampleRate, - android::AudioSystem::PCM_16_BIT, numChannels, 8*1024, 0); + android::AUDIO_SOURCE_DEFAULT, + sampleRate, + android::AudioSystem::PCM_16_BIT, + (numChannels > 1) ? android::AudioSystem::CHANNEL_IN_STEREO : android::AudioSystem::CHANNEL_IN_MONO, + 8*1024, + 0); if (!record) return -1; @@ -147,7 +151,7 @@ int AudioSetVolume(int stream_type, int volume) #if defined(USE_DEV_EAC_FILE) return 0; #else - return AudioSystem::setStreamVolume(stream_type, (float)volume/100.0f); + return AudioSystem::setStreamVolume(stream_type, volume, 0); #endif } @@ -157,7 +161,7 @@ int AudioGetVolume(int stream_type) return 0; #else float v = 0; - AudioSystem::getStreamVolume(stream_type, &v); + AudioSystem::getStreamVolume(stream_type, &v, 0); return int(v * 100.0f); #endif } diff --git a/srec/ca/acc_basi.c b/srec/ca/acc_basi.c index b3be53e..4cc89a5 100644 --- a/srec/ca/acc_basi.c +++ b/srec/ca/acc_basi.c @@ -75,6 +75,11 @@ int CA_LoadAcousticSub(CA_Acoustic *hAcoust, char *subname, CA_AcoustInputParams { /* SpeechWorks image format! */ hAcoust->swimodel = load_swimodel(subname); + if (hAcoust->swimodel == NULL) + { + // failed to load, load_swimodel will have printed an error to the log + return 0; + } hAcoust->is_loaded = ESR_TRUE; return 1; } diff --git a/srec_jni/android_speech_srec_MicrophoneInputStream.cpp b/srec_jni/android_speech_srec_MicrophoneInputStream.cpp index 8ca4cdd..537c4f1 100644 --- a/srec_jni/android_speech_srec_MicrophoneInputStream.cpp +++ b/srec_jni/android_speech_srec_MicrophoneInputStream.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include @@ -55,8 +55,8 @@ static JNIEXPORT jint JNICALL Java_android_speech_srec_Recognizer_AudioRecordNew (JNIEnv *env, jclass clazz, jint sampleRate, jint fifoFrames) { android::AudioRecord* ar = new android::AudioRecord( - android::AudioRecord::DEFAULT_INPUT, sampleRate, - android::AudioSystem::PCM_16_BIT, 1, + android::AUDIO_SOURCE_VOICE_RECOGNITION, sampleRate, + android::AudioSystem::PCM_16_BIT, android::AudioSystem::CHANNEL_IN_MONO, fifoFrames, 0); if (ar == NULL) { LOGE("Error creating AudioRecord"); diff --git a/tools/grxmlcompile/gr_iface.cpp b/tools/grxmlcompile/gr_iface.cpp index e6a37c7..5667ea9 100644 --- a/tools/grxmlcompile/gr_iface.cpp +++ b/tools/grxmlcompile/gr_iface.cpp @@ -21,6 +21,7 @@ #include #include #include +#include #include "grph.h" diff --git a/tools/grxmlcompile/sub_base.cpp b/tools/grxmlcompile/sub_base.cpp index 95368b5..4624b42 100644 --- a/tools/grxmlcompile/sub_base.cpp +++ b/tools/grxmlcompile/sub_base.cpp @@ -21,6 +21,7 @@ #include #include #include +#include #include "sub_grph.h" diff --git a/tools/grxmlcompile/sub_grph.cpp b/tools/grxmlcompile/sub_grph.cpp index 4b30556..64b0ce1 100644 --- a/tools/grxmlcompile/sub_grph.cpp +++ b/tools/grxmlcompile/sub_grph.cpp @@ -21,6 +21,7 @@ #include #include #include +#include #include "sub_grph.h" diff --git a/tools/grxmlcompile/sub_min.cpp b/tools/grxmlcompile/sub_min.cpp index 9692ec0..4dd9c13 100644 --- a/tools/grxmlcompile/sub_min.cpp +++ b/tools/grxmlcompile/sub_min.cpp @@ -21,6 +21,7 @@ #include #include #include +#include #include "sub_grph.h" diff --git a/tools/grxmlcompile/sub_supp.cpp b/tools/grxmlcompile/sub_supp.cpp index 325cd61..4acd394 100644 --- a/tools/grxmlcompile/sub_supp.cpp +++ b/tools/grxmlcompile/sub_supp.cpp @@ -21,6 +21,7 @@ #include #include #include +#include #include "sub_grph.h" -- 2.11.0