From 7fb865653293e665f48b31e791ca124e98c7d257 Mon Sep 17 00:00:00 2001 From: Jeff Brown Date: Thu, 15 Aug 2013 18:06:37 -0700 Subject: 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 --- media/libstagefright/wifi-display/wfd.cpp | 26 -------------------------- 1 file changed, 26 deletions(-) (limited to 'media/libstagefright/wifi-display') 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 sm = defaultServiceManager(); sp 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( -- cgit v1.1