diff options
Diffstat (limited to 'media')
6 files changed, 31 insertions, 29 deletions
diff --git a/media/libeffects/data/audio_effects.conf b/media/libeffects/data/audio_effects.conf index d681c69..93f27cb 100644 --- a/media/libeffects/data/audio_effects.conf +++ b/media/libeffects/data/audio_effects.conf @@ -15,14 +15,18 @@ libraries { visualizer { path /system/lib/soundfx/libvisualizer.so } - pre_processing { - path /system/lib/soundfx/libaudiopreprocessing.so - } downmix { path /system/lib/soundfx/libdownmix.so } } +# Default pre-processing library. Add to audio_effect.conf "libraries" section if +# audio HAL implements support for default software audio pre-processing effects +# +# pre_processing { +# path /system/lib/soundfx/libaudiopreprocessing.so +# } + # list of effects to load. Each effect element must contain a "library" and a "uuid" element. # The value of the "library" element must correspond to the name of one library element in the # "libraries" element. @@ -79,19 +83,24 @@ effects { library downmix uuid 93f04452-e4fe-41cc-91f9-e475b6d1d69f } - agc { - library pre_processing - uuid aa8130e0-66fc-11e0-bad0-0002a5d5c51b - } - aec { - library pre_processing - uuid bb392ec0-8d4d-11e0-a896-0002a5d5c51b - } - ns { - library pre_processing - uuid c06c8400-8e06-11e0-9cb6-0002a5d5c51b - } } + +# Default pre-processing effects. Add to audio_effect.conf "effects" section if +# audio HAL implements support for them. +# +# agc { +# library pre_processing +# uuid aa8130e0-66fc-11e0-bad0-0002a5d5c51b +# } +# aec { +# library pre_processing +# uuid bb392ec0-8d4d-11e0-a896-0002a5d5c51b +# } +# ns { +# library pre_processing +# uuid c06c8400-8e06-11e0-9cb6-0002a5d5c51b +# } + # Audio preprocessor configurations. # The pre processor configuration consists in a list of elements each describing # pre processor settings for a given input source. Valid input source names are: diff --git a/media/libstagefright/codecs/aacenc/inc/aac_rom.h b/media/libstagefright/codecs/aacenc/inc/aac_rom.h index 8e206b7..0b6f656 100644 --- a/media/libstagefright/codecs/aacenc/inc/aac_rom.h +++ b/media/libstagefright/codecs/aacenc/inc/aac_rom.h @@ -57,7 +57,7 @@ extern const Word32 mTab_4_3[512]; /*! $2^{-\frac{n}{16}}$ table */ extern const Word16 pow2tominusNover16[17] ; -extern Word32 specExpMantTableComb_enc[4][14]; +extern const Word32 specExpMantTableComb_enc[4][14]; extern const UWord8 specExpTableComb_enc[4][14]; extern const Word16 quantBorders[4][4]; diff --git a/media/libstagefright/codecs/aacenc/src/aac_rom.c b/media/libstagefright/codecs/aacenc/src/aac_rom.c index 127322d..f08f3a9 100644 --- a/media/libstagefright/codecs/aacenc/src/aac_rom.c +++ b/media/libstagefright/codecs/aacenc/src/aac_rom.c @@ -1367,7 +1367,7 @@ const Word16 sideInfoTabShort[MAX_SFB_SHORT + 1] = { 10, 10, 10, 10, 10, 13, 13 }; -Word32 specExpMantTableComb_enc[4][14] = +const Word32 specExpMantTableComb_enc[4][14] = { {0x40000000, 0x50a28be6, 0x6597fa95, 0x40000000, 0x50a28be6, 0x6597fa95, 0x40000000, 0x50a28be6, diff --git a/media/libstagefright/codecs/aacenc/src/block_switch.c b/media/libstagefright/codecs/aacenc/src/block_switch.c index 47fd15e..c80538f 100644 --- a/media/libstagefright/codecs/aacenc/src/block_switch.c +++ b/media/libstagefright/codecs/aacenc/src/block_switch.c @@ -51,7 +51,7 @@ CalcWindowEnergy(BLOCK_SWITCHING_CONTROL *blockSwitchingControl, /* IIR high pass coeffs */ -Word32 hiPassCoeff[BLOCK_SWITCHING_IIR_LEN] = { +const Word32 hiPassCoeff[BLOCK_SWITCHING_IIR_LEN] = { 0xbec8b439, 0x609d4952 /* -0.5095f, 0.7548f */ }; diff --git a/media/libstagefright/wifi-display/source/PlaybackSession.cpp b/media/libstagefright/wifi-display/source/PlaybackSession.cpp index a6aae56..ab16407 100644 --- a/media/libstagefright/wifi-display/source/PlaybackSession.cpp +++ b/media/libstagefright/wifi-display/source/PlaybackSession.cpp @@ -647,11 +647,10 @@ status_t WifiDisplaySource::PlaybackSession::setupPacketizer() { service->connectDisplay(mBufferQueue); } -#if 0 sp<AudioSource> audioSource = new AudioSource( - AUDIO_SOURCE_MIC, + AUDIO_SOURCE_REMOTE_SUBMIX, 48000 /* sampleRate */, - 2 /* channelCount */); // XXX AUDIO_CHANNEL_IN_STEREO? + 2 /* channelCount */); if (audioSource->initCheck() == OK) { audioSource->setUseLooperTime(true); @@ -670,11 +669,12 @@ status_t WifiDisplaySource::PlaybackSession::setupPacketizer() { looper()->registerHandler(converter); mTracks.add(index, new Track(converter)); + + ALOGI("Successfully instantiated audio source."); } else { ALOGW("Unable to instantiate audio source"); } #endif -#endif return OK; } diff --git a/media/libstagefright/wifi-display/source/Serializer.cpp b/media/libstagefright/wifi-display/source/Serializer.cpp index bd53fc8..0c54bf7 100644 --- a/media/libstagefright/wifi-display/source/Serializer.cpp +++ b/media/libstagefright/wifi-display/source/Serializer.cpp @@ -275,14 +275,7 @@ status_t Serializer::onStart() { } if (err == OK) { -#if 0 schedulePoll(); -#else - // XXX the dongle doesn't appear to have setup the RTP connection - // fully at the time PLAY is called. We have to delay sending data - // for a little bit. - schedulePoll(500000ll); -#endif } return err; |