diff options
| author | Jeff Brown <jeffbrown@google.com> | 2013-08-15 18:06:37 -0700 |
|---|---|---|
| committer | Jeff Brown <jeffbrown@google.com> | 2013-08-16 20:21:07 -0700 |
| commit | 7fb865653293e665f48b31e791ca124e98c7d257 (patch) | |
| tree | b987e932abf97aae86ad60069927e1606404cea9 /media/libstagefright/wifi-display | |
| parent | e9f3a3141c2eaafa3a5a3417d1e5682a909c5b31 (diff) | |
| download | frameworks_av-7fb865653293e665f48b31e791ca124e98c7d257.zip frameworks_av-7fb865653293e665f48b31e791ca124e98c7d257.tar.gz frameworks_av-7fb865653293e665f48b31e791ca124e98c7d257.tar.bz2 | |
Remove call to enable/disable remote submix from test program.
The submix will be controlled automatically from now on based on
whether there is an active audio recorder.
Bug: 10265163
Change-Id: Iea8164182daa037066f60974b54597d20db4903b
Diffstat (limited to 'media/libstagefright/wifi-display')
| -rw-r--r-- | media/libstagefright/wifi-display/wfd.cpp | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/media/libstagefright/wifi-display/wfd.cpp b/media/libstagefright/wifi-display/wfd.cpp index 4607606..04cb319 100644 --- a/media/libstagefright/wifi-display/wfd.cpp +++ b/media/libstagefright/wifi-display/wfd.cpp @@ -138,28 +138,6 @@ void RemoteDisplayClient::waitUntilDone() { } } -static status_t enableAudioSubmix(bool enable) { - status_t err = AudioSystem::setDeviceConnectionState( - AUDIO_DEVICE_IN_REMOTE_SUBMIX, - enable - ? AUDIO_POLICY_DEVICE_STATE_AVAILABLE - : AUDIO_POLICY_DEVICE_STATE_UNAVAILABLE, - NULL /* device_address */); - - if (err != OK) { - return err; - } - - err = AudioSystem::setDeviceConnectionState( - AUDIO_DEVICE_OUT_REMOTE_SUBMIX, - enable - ? AUDIO_POLICY_DEVICE_STATE_AVAILABLE - : AUDIO_POLICY_DEVICE_STATE_UNAVAILABLE, - NULL /* device_address */); - - return err; -} - static void createSource(const AString &addr, int32_t port) { sp<IServiceManager> sm = defaultServiceManager(); sp<IBinder> binder = sm->getService(String16("media.player")); @@ -168,8 +146,6 @@ static void createSource(const AString &addr, int32_t port) { CHECK(service.get() != NULL); - enableAudioSubmix(true /* enable */); - String8 iface; iface.append(addr.c_str()); iface.append(StringPrintf(":%d", port).c_str()); @@ -182,8 +158,6 @@ static void createSource(const AString &addr, int32_t port) { display->dispose(); display.clear(); - - enableAudioSubmix(false /* enable */); } static void createFileSource( |