From 94a483bf2bd699275673d9cd57cb125d48572f30 Mon Sep 17 00:00:00 2001 From: Andreas Huber Date: Tue, 29 Jan 2013 09:22:16 -0800 Subject: Squashed commit of the following: commit f2c38e5cf8cee3b597c744c9d6a9c0969ac8599a Author: Andreas Huber Date: Mon Jan 28 16:33:07 2013 -0800 Proper support for video format selection/negotiation. Change-Id: I7db86cef939d63b8064be1c74de9ad78e85d45d9 commit 488023b7bad086692ffe942114fa3cc0e59a16c0 Author: Andreas Huber Date: Mon Jan 28 11:21:23 2013 -0800 Sink now notifies clients once it is disconnected. Change-Id: I2f0a458ef1ec30dda1272ad5a013fee4ee70edc9 commit 783932e40dd904aa531c263ad51280d9ca814dcb Author: Andreas Huber Date: Tue Dec 18 15:03:40 2012 -0800 Alternative DirectRenderer implementation. Change-Id: I307beb913d7a61cb938bcb02696cc2e82d2b8b07 commit 1935cc9a87824aea71fc8ebe2162f62ec634ce5a Author: Andreas Huber Date: Tue Dec 18 10:24:27 2012 -0800 Experimenting with wifi sink timing. Change-Id: I059bae9762cf11777666988a8b4ab2012b5807be commit a859ee1eadd6a1d6a080667917e8b102c3770d61 Author: Andreas Huber Date: Thu Nov 15 11:16:30 2012 -0800 wfd sink update. Change-Id: I026dfc580be92aa40dbbe7c1bc061fadf3b08be8 Change-Id: I191d3d7015869ca99254d813d074328fb5b2f479 --- media/libstagefright/wifi-display/source/WifiDisplaySource.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'media/libstagefright/wifi-display/source/WifiDisplaySource.h') diff --git a/media/libstagefright/wifi-display/source/WifiDisplaySource.h b/media/libstagefright/wifi-display/source/WifiDisplaySource.h index 974e070..fec2c6d 100644 --- a/media/libstagefright/wifi-display/source/WifiDisplaySource.h +++ b/media/libstagefright/wifi-display/source/WifiDisplaySource.h @@ -19,6 +19,7 @@ #define WIFI_DISPLAY_SOURCE_H_ #include "ANetworkSession.h" +#include "VideoFormats.h" #include @@ -26,8 +27,6 @@ namespace android { -#define USE_1080P 0 - struct IHDCP; struct IRemoteDisplayClient; struct ParsedMessage; @@ -112,6 +111,7 @@ private: kPlaybackSessionTimeoutSecs * 1000000ll; State mState; + VideoFormats mSupportedSourceVideoFormats; sp mNetSession; sp mClient; struct in_addr mInterfaceAddr; @@ -121,6 +121,14 @@ private: int32_t mChosenRTPPort; // extracted from "wfd_client_rtp_ports" + bool mSinkSupportsVideo; + VideoFormats mSupportedSinkVideoFormats; + + VideoFormats::ResolutionType mChosenVideoResolutionType; + size_t mChosenVideoResolutionIndex; + + bool mSinkSupportsAudio; + bool mUsingPCMAudio; int32_t mClientSessionID; -- cgit v1.1 From 7cc0c29d6a7b76520ec588437ab51d5b8eac9ebc Mon Sep 17 00:00:00 2001 From: Andreas Huber Date: Fri, 1 Feb 2013 11:43:44 -0800 Subject: Revive the code to support TCP interleaved transport Also support non-interleaved transport now, but the sink gets to decide what mode it wants to run in, _not_ the source. Change-Id: I3b6057f86871084e4decf930bb4a7a2d7517b0f2 --- media/libstagefright/wifi-display/source/WifiDisplaySource.h | 1 + 1 file changed, 1 insertion(+) (limited to 'media/libstagefright/wifi-display/source/WifiDisplaySource.h') diff --git a/media/libstagefright/wifi-display/source/WifiDisplaySource.h b/media/libstagefright/wifi-display/source/WifiDisplaySource.h index fec2c6d..724462c 100644 --- a/media/libstagefright/wifi-display/source/WifiDisplaySource.h +++ b/media/libstagefright/wifi-display/source/WifiDisplaySource.h @@ -119,6 +119,7 @@ private: uint32_t mStopReplyID; + AString mWfdClientRtpPorts; int32_t mChosenRTPPort; // extracted from "wfd_client_rtp_ports" bool mSinkSupportsVideo; -- cgit v1.1 From d5e56231a598b180a1d898bb7dc61b75580e59a4 Mon Sep 17 00:00:00 2001 From: Andreas Huber Date: Tue, 12 Mar 2013 11:01:43 -0700 Subject: Squashed commit of the following: commit f4edf442741886cdbe071e2d15f6e6247269f7c5 Author: Andreas Huber Date: Tue Mar 12 09:09:18 2013 -0700 Pass additional flags to the sink, use TCP by default in wolfiecast mode. Change-Id: I41e11a2375d4199656e45c4f149d8441d0016092 commit 6302602ed280a38287f507159abfb40a1da38c5a Author: Andreas Huber Date: Tue Mar 12 08:51:58 2013 -0700 tweaks Change-Id: Ie29e422d7258be522f4bb1f6c5afcf74c937e547 commit a38a860e4979ba563cadbaafa21b084439449d26 Author: Andreas Huber Date: Mon Mar 11 16:57:43 2013 -0700 Report average lateness all the way from NuPlayerRenderer... Change-Id: I2e7700703ae656515e44b9c25610d26c75778111 commit a7d49b11675ea88be4029dd8451d1649db94571d Author: Andreas Huber Date: Mon Mar 11 14:54:19 2013 -0700 Make TimeSyncer smarter, enable TunnelRenderer Change-Id: I27377a60cd8feb01589da456967fddd34532c20e commit 0f214c8ef68179f7b61512c37040939554013151 Author: Andreas Huber Date: Thu Mar 7 15:57:56 2013 -0800 convert source timestamps to sink timestamps, report lateness. Change-Id: I051a60fbbceca2f7b508ae3dac6e01e402bae39e commit 04a4f8e16bad09157b5615a5fa45310438955832 Author: Andreas Huber Date: Thu Mar 7 09:00:28 2013 -0800 Sync time between sink and source. Change-Id: Ie8b4d75c957aa48310e7c81d1279761b9f821efe commit aebe20e6184e3636a99082f8ece08e708015cb8d Author: Andreas Huber Date: Wed Mar 6 09:03:12 2013 -0800 play with back pressure Change-Id: I51eb69257e6a79e76f5f9c75ff99d8adbd083947 Change-Id: Ifdf57228667fed7fc71c5090a2c3f7cea1037c5c --- media/libstagefright/wifi-display/source/WifiDisplaySource.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'media/libstagefright/wifi-display/source/WifiDisplaySource.h') diff --git a/media/libstagefright/wifi-display/source/WifiDisplaySource.h b/media/libstagefright/wifi-display/source/WifiDisplaySource.h index 724462c..9e72682 100644 --- a/media/libstagefright/wifi-display/source/WifiDisplaySource.h +++ b/media/libstagefright/wifi-display/source/WifiDisplaySource.h @@ -30,6 +30,7 @@ namespace android { struct IHDCP; struct IRemoteDisplayClient; struct ParsedMessage; +struct TimeSyncer; // Represents the RTSP server acting as a wifi display source. // Manages incoming connections, sets up Playback sessions as necessary. @@ -81,6 +82,7 @@ private: kWhatHDCPNotify, kWhatFinishStop2, kWhatTeardownTriggerTimedOut, + kWhatTimeSyncerNotify, }; struct ResponseID { @@ -114,6 +116,7 @@ private: VideoFormats mSupportedSourceVideoFormats; sp mNetSession; sp mClient; + sp mTimeSyncer; struct in_addr mInterfaceAddr; int32_t mSessionID; -- cgit v1.1 From 0b530f1050150bb751ae642d5a9dce34141d9475 Mon Sep 17 00:00:00 2001 From: Andreas Huber Date: Mon, 18 Mar 2013 11:09:22 -0700 Subject: Allow for streaming of media files (without recompression) Change-Id: I1de356cc37506ba986822d12a1a59e7b64069e02 --- media/libstagefright/wifi-display/source/WifiDisplaySource.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'media/libstagefright/wifi-display/source/WifiDisplaySource.h') diff --git a/media/libstagefright/wifi-display/source/WifiDisplaySource.h b/media/libstagefright/wifi-display/source/WifiDisplaySource.h index 9e72682..3a1b0f9 100644 --- a/media/libstagefright/wifi-display/source/WifiDisplaySource.h +++ b/media/libstagefright/wifi-display/source/WifiDisplaySource.h @@ -39,7 +39,8 @@ struct WifiDisplaySource : public AHandler { WifiDisplaySource( const sp &netSession, - const sp &client); + const sp &client, + const char *path = NULL); status_t start(const char *iface); status_t stop(); @@ -116,6 +117,7 @@ private: VideoFormats mSupportedSourceVideoFormats; sp mNetSession; sp mClient; + AString mMediaPath; sp mTimeSyncer; struct in_addr mInterfaceAddr; int32_t mSessionID; @@ -161,6 +163,8 @@ private: bool mHDCPInitializationComplete; bool mSetupTriggerDeferred; + bool mPlaybackSessionEstablished; + status_t makeHDCP(); // <<<< HDCP specific section @@ -257,6 +261,8 @@ private: void finishStopAfterDisconnectingClient(); void finishStop2(); + void finishPlay(); + DISALLOW_EVIL_CONSTRUCTORS(WifiDisplaySource); }; -- cgit v1.1 From cd77d4a1d38b7609a03f6826a1ff5fa7c98aa34f Mon Sep 17 00:00:00 2001 From: Andreas Huber Date: Tue, 26 Mar 2013 10:19:24 -0700 Subject: Identify network servers and clients with a OS version related string and put the logic to create that string in one location instead of many... Change-Id: I1f729f2e7376cd3b45eea0e48f7bd10084b41b39 --- media/libstagefright/wifi-display/source/WifiDisplaySource.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'media/libstagefright/wifi-display/source/WifiDisplaySource.h') diff --git a/media/libstagefright/wifi-display/source/WifiDisplaySource.h b/media/libstagefright/wifi-display/source/WifiDisplaySource.h index 3a1b0f9..3efa0b4 100644 --- a/media/libstagefright/wifi-display/source/WifiDisplaySource.h +++ b/media/libstagefright/wifi-display/source/WifiDisplaySource.h @@ -113,6 +113,8 @@ private: static const int64_t kPlaybackSessionTimeoutUs = kPlaybackSessionTimeoutSecs * 1000000ll; + static const AString sUserAgent; + State mState; VideoFormats mSupportedSourceVideoFormats; sp mNetSession; -- cgit v1.1 From 3a9682a86ead84d6f60d3f3aa01b2b4d34af983d Mon Sep 17 00:00:00 2001 From: Andreas Huber Date: Tue, 23 Apr 2013 13:47:46 -0700 Subject: Remove all traces of wifi display sink implementation and supporting code. Change-Id: I64b681b7e3df1ef0dd80c0d261cacae293d5e684 related-to-bug: 8698812 --- media/libstagefright/wifi-display/source/WifiDisplaySource.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'media/libstagefright/wifi-display/source/WifiDisplaySource.h') diff --git a/media/libstagefright/wifi-display/source/WifiDisplaySource.h b/media/libstagefright/wifi-display/source/WifiDisplaySource.h index 3efa0b4..44d3e4d 100644 --- a/media/libstagefright/wifi-display/source/WifiDisplaySource.h +++ b/media/libstagefright/wifi-display/source/WifiDisplaySource.h @@ -30,7 +30,6 @@ namespace android { struct IHDCP; struct IRemoteDisplayClient; struct ParsedMessage; -struct TimeSyncer; // Represents the RTSP server acting as a wifi display source. // Manages incoming connections, sets up Playback sessions as necessary. @@ -83,7 +82,6 @@ private: kWhatHDCPNotify, kWhatFinishStop2, kWhatTeardownTriggerTimedOut, - kWhatTimeSyncerNotify, }; struct ResponseID { @@ -120,7 +118,6 @@ private: sp mNetSession; sp mClient; AString mMediaPath; - sp mTimeSyncer; struct in_addr mInterfaceAddr; int32_t mSessionID; -- cgit v1.1 From c86ef45279185b474bd6af0a7ae407f8ab577f13 Mon Sep 17 00:00:00 2001 From: Andreas Huber Date: Fri, 26 Apr 2013 08:42:50 -0700 Subject: Revert "Remove all traces of wifi display sink implementation and supporting code." This reverts commit 3a9682a86ead84d6f60d3f3aa01b2b4d34af983d. --- media/libstagefright/wifi-display/source/WifiDisplaySource.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'media/libstagefright/wifi-display/source/WifiDisplaySource.h') diff --git a/media/libstagefright/wifi-display/source/WifiDisplaySource.h b/media/libstagefright/wifi-display/source/WifiDisplaySource.h index 44d3e4d..3efa0b4 100644 --- a/media/libstagefright/wifi-display/source/WifiDisplaySource.h +++ b/media/libstagefright/wifi-display/source/WifiDisplaySource.h @@ -30,6 +30,7 @@ namespace android { struct IHDCP; struct IRemoteDisplayClient; struct ParsedMessage; +struct TimeSyncer; // Represents the RTSP server acting as a wifi display source. // Manages incoming connections, sets up Playback sessions as necessary. @@ -82,6 +83,7 @@ private: kWhatHDCPNotify, kWhatFinishStop2, kWhatTeardownTriggerTimedOut, + kWhatTimeSyncerNotify, }; struct ResponseID { @@ -118,6 +120,7 @@ private: sp mNetSession; sp mClient; AString mMediaPath; + sp mTimeSyncer; struct in_addr mInterfaceAddr; int32_t mSessionID; -- cgit v1.1 From 308bcaa44e578279e61be32b572fdb0b11b1e4c7 Mon Sep 17 00:00:00 2001 From: Chong Zhang Date: Fri, 3 May 2013 21:54:17 -0700 Subject: wifi-display: add support for metadata mode on encoder output pass buffer_handle_t from encoder output to HDCP encryptor input Bug: 8968123 Change-Id: Iea8007ce568641e213fd2e3cf6947a6f7a95746c --- media/libstagefright/wifi-display/source/WifiDisplaySource.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'media/libstagefright/wifi-display/source/WifiDisplaySource.h') diff --git a/media/libstagefright/wifi-display/source/WifiDisplaySource.h b/media/libstagefright/wifi-display/source/WifiDisplaySource.h index 3efa0b4..64186fc 100644 --- a/media/libstagefright/wifi-display/source/WifiDisplaySource.h +++ b/media/libstagefright/wifi-display/source/WifiDisplaySource.h @@ -134,6 +134,8 @@ private: VideoFormats::ResolutionType mChosenVideoResolutionType; size_t mChosenVideoResolutionIndex; + VideoFormats::ProfileType mChosenVideoProfile; + VideoFormats::LevelType mChosenVideoLevel; bool mSinkSupportsAudio; -- cgit v1.1 From 8060060217ff16cd67c8f6a15c649f44c343acf0 Mon Sep 17 00:00:00 2001 From: Andreas Huber Date: Thu, 18 Jul 2013 14:36:18 -0700 Subject: ANetworkSession and ParsedMessage are now part of stagefright foundation. Also fixes some bugs in ParseMessage and adds "WebSocket" mode to ANetworkSession, something that's opt-in and should not affect existing clients of the API. Change-Id: I86d5748e0d818231d85d3590d86c2b41d4f8b1f1 --- media/libstagefright/wifi-display/source/WifiDisplaySource.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'media/libstagefright/wifi-display/source/WifiDisplaySource.h') diff --git a/media/libstagefright/wifi-display/source/WifiDisplaySource.h b/media/libstagefright/wifi-display/source/WifiDisplaySource.h index 64186fc..4f11712 100644 --- a/media/libstagefright/wifi-display/source/WifiDisplaySource.h +++ b/media/libstagefright/wifi-display/source/WifiDisplaySource.h @@ -18,10 +18,10 @@ #define WIFI_DISPLAY_SOURCE_H_ -#include "ANetworkSession.h" #include "VideoFormats.h" #include +#include #include -- cgit v1.1 From 6ea551fa13b69e5ce359a7dba7485d857a005304 Mon Sep 17 00:00:00 2001 From: Andreas Huber Date: Wed, 2 Oct 2013 13:06:06 -0700 Subject: Remove obsolete miracast sink code and friends. Change-Id: I8bbb22fb0cfe2d73881d9f05bf8112ae86d8040b related-to-bug: 11047222 --- media/libstagefright/wifi-display/source/WifiDisplaySource.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'media/libstagefright/wifi-display/source/WifiDisplaySource.h') diff --git a/media/libstagefright/wifi-display/source/WifiDisplaySource.h b/media/libstagefright/wifi-display/source/WifiDisplaySource.h index 4f11712..750265f 100644 --- a/media/libstagefright/wifi-display/source/WifiDisplaySource.h +++ b/media/libstagefright/wifi-display/source/WifiDisplaySource.h @@ -30,7 +30,6 @@ namespace android { struct IHDCP; struct IRemoteDisplayClient; struct ParsedMessage; -struct TimeSyncer; // Represents the RTSP server acting as a wifi display source. // Manages incoming connections, sets up Playback sessions as necessary. @@ -83,7 +82,6 @@ private: kWhatHDCPNotify, kWhatFinishStop2, kWhatTeardownTriggerTimedOut, - kWhatTimeSyncerNotify, }; struct ResponseID { @@ -120,7 +118,6 @@ private: sp mNetSession; sp mClient; AString mMediaPath; - sp mTimeSyncer; struct in_addr mInterfaceAddr; int32_t mSessionID; -- cgit v1.1