diff options
author | Andreas Huber <andih@google.com> | 2012-10-04 14:45:55 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-04 14:45:56 -0700 |
commit | 6ec0f94d606d57db57c8866b0e38ec96f1979413 (patch) | |
tree | 579dc653bcefc5362dc9fc0ec360e42a08c06736 /media/libstagefright/wifi-display/source/WifiDisplaySource.h | |
parent | ef7fdc2224eb2e8a2b220ef51b5dc3ce25b807ba (diff) | |
parent | 20a5a98667df7ed83e5d9f37e88b1bbdb876d718 (diff) | |
download | frameworks_av-6ec0f94d606d57db57c8866b0e38ec96f1979413.zip frameworks_av-6ec0f94d606d57db57c8866b0e38ec96f1979413.tar.gz frameworks_av-6ec0f94d606d57db57c8866b0e38ec96f1979413.tar.bz2 |
Merge "Optionally emit LPCM audio instead of using AAC in wifi display code" into jb-mr1-dev
Diffstat (limited to 'media/libstagefright/wifi-display/source/WifiDisplaySource.h')
-rw-r--r-- | media/libstagefright/wifi-display/source/WifiDisplaySource.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/media/libstagefright/wifi-display/source/WifiDisplaySource.h b/media/libstagefright/wifi-display/source/WifiDisplaySource.h index c30e3cb..0692cde 100644 --- a/media/libstagefright/wifi-display/source/WifiDisplaySource.h +++ b/media/libstagefright/wifi-display/source/WifiDisplaySource.h @@ -26,7 +26,7 @@ namespace android { -#define REQUIRE_HDCP 1 +#define REQUIRE_HDCP 1 struct IHDCP; struct IRemoteDisplayClient; @@ -114,6 +114,7 @@ private: uint32_t mStopReplyID; + bool mUsingPCMAudio; int32_t mClientSessionID; struct ClientInfo { |