Merge "MediaPlayer2: remove libnetd_client dependency." (eb0769ba) · Commits · e / os / android_frameworks_av

media/libmediaplayerservice/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ cc_library_shared {
		"libmediametrics",
		"libmediautils",
		"libmemunreachable",
		"libnetd_client",
		"libpowermanager",
		"libstagefright",
		"libstagefright_foundation",

media/libstagefright/HTTPBase.cpp

+0 −26

Original line number	Diff line number	Diff line
		@@ -114,30 +114,4 @@ void HTTPBase::setBandwidthHistorySize(size_t numHistoryItems) {
		mMaxBandwidthHistoryItems = numHistoryItems;
		}

		// static
		void HTTPBase::RegisterSocketUserTag(int sockfd, uid_t uid, uint32_t kTag) {
		int res = qtaguid_tagSocket(sockfd, kTag, uid);
		if (res != 0) {
		ALOGE("Failed tagging socket %d for uid %d (My UID=%d)", sockfd, uid, geteuid());
		}
		}

		// static
		void HTTPBase::UnRegisterSocketUserTag(int sockfd) {
		int res = qtaguid_untagSocket(sockfd);
		if (res != 0) {
		ALOGE("Failed untagging socket %d (My UID=%d)", sockfd, geteuid());
		}
		}

		// static
		void HTTPBase::RegisterSocketUserMark(int sockfd, uid_t uid) {
		setNetworkForUser(uid, sockfd);
		}

		// static
		void HTTPBase::UnRegisterSocketUserMark(int sockfd) {
		RegisterSocketUserMark(sockfd, geteuid());
		}

		} // namespace android

media/libstagefright/include/HTTPBase.h

+0 −6

Original line number	Diff line number	Diff line
		@@ -51,12 +51,6 @@ struct HTTPBase : public DataSource {

		virtual void setBandwidthHistorySize(size_t numHistoryItems);

		static void RegisterSocketUserTag(int sockfd, uid_t uid, uint32_t kTag);
		static void UnRegisterSocketUserTag(int sockfd);

		static void RegisterSocketUserMark(int sockfd, uid_t uid);
		static void UnRegisterSocketUserMark(int sockfd);

		virtual String8 toString() {
		return mName;
		}

media/libstagefright/rtsp/ARTSPConnection.cpp

+13 −12

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@
		#include <utils/Log.h>

		#include "ARTSPConnection.h"
		#include "NetworkUtils.h"

		#include <media/stagefright/foundation/ABuffer.h>
		#include <media/stagefright/foundation/ADebug.h>
		@@ -59,8 +60,8 @@ ARTSPConnection::~ARTSPConnection() {
		if (mSocket >= 0) {
		ALOGE("Connection is still open, closing the socket.");
		if (mUIDValid) {
		HTTPBase::UnRegisterSocketUserTag(mSocket);
		HTTPBase::UnRegisterSocketUserMark(mSocket);
		NetworkUtils::UnRegisterSocketUserTag(mSocket);
		NetworkUtils::UnRegisterSocketUserMark(mSocket);
		}
		close(mSocket);
		mSocket = -1;
		@@ -214,8 +215,8 @@ void ARTSPConnection::onConnect(const sp<AMessage> &msg) {

		if (mState != DISCONNECTED) {
		if (mUIDValid) {
		HTTPBase::UnRegisterSocketUserTag(mSocket);
		HTTPBase::UnRegisterSocketUserMark(mSocket);
		NetworkUtils::UnRegisterSocketUserTag(mSocket);
		NetworkUtils::UnRegisterSocketUserMark(mSocket);
		}
		close(mSocket);
		mSocket = -1;
		@@ -266,9 +267,9 @@ void ARTSPConnection::onConnect(const sp<AMessage> &msg) {
		mSocket = socket(AF_INET, SOCK_STREAM, 0);

		if (mUIDValid) {
		HTTPBase::RegisterSocketUserTag(mSocket, mUID,
		NetworkUtils::RegisterSocketUserTag(mSocket, mUID,
		(uint32_t)(uint32_t) "RTSP");
		HTTPBase::RegisterSocketUserMark(mSocket, mUID);
		NetworkUtils::RegisterSocketUserMark(mSocket, mUID);
		}

		MakeSocketBlocking(mSocket, false);
		@@ -297,8 +298,8 @@ void ARTSPConnection::onConnect(const sp<AMessage> &msg) {
		mState = DISCONNECTED;

		if (mUIDValid) {
		HTTPBase::UnRegisterSocketUserTag(mSocket);
		HTTPBase::UnRegisterSocketUserMark(mSocket);
		NetworkUtils::UnRegisterSocketUserTag(mSocket);
		NetworkUtils::UnRegisterSocketUserMark(mSocket);
		}
		close(mSocket);
		mSocket = -1;
		@@ -315,8 +316,8 @@ void ARTSPConnection::onConnect(const sp<AMessage> &msg) {

		void ARTSPConnection::performDisconnect() {
		if (mUIDValid) {
		HTTPBase::UnRegisterSocketUserTag(mSocket);
		HTTPBase::UnRegisterSocketUserMark(mSocket);
		NetworkUtils::UnRegisterSocketUserTag(mSocket);
		NetworkUtils::UnRegisterSocketUserMark(mSocket);
		}
		close(mSocket);
		mSocket = -1;
		@@ -389,8 +390,8 @@ void ARTSPConnection::onCompleteConnection(const sp<AMessage> &msg) {

		mState = DISCONNECTED;
		if (mUIDValid) {
		HTTPBase::UnRegisterSocketUserTag(mSocket);
		HTTPBase::UnRegisterSocketUserMark(mSocket);
		NetworkUtils::UnRegisterSocketUserTag(mSocket);
		NetworkUtils::UnRegisterSocketUserMark(mSocket);
		}
		close(mSocket);
		mSocket = -1;

media/libstagefright/rtsp/Android.bp

+17 −2

Original line number	Diff line number	Diff line
		cc_library_static {
		name: "libstagefright_rtsp",
		cc_defaults {
		name: "libstagefright_rtsp_defaults",

		srcs: [
		"AAMRAssembler.cpp",
		@@ -52,6 +52,21 @@ cc_library_static {
		},
		}

		cc_library_static {
		name: "libstagefright_rtsp",

		srcs: ["NetworkUtils.cpp"],
		header_libs: ["libnetd_client_headers"],
		defaults: ["libstagefright_rtsp_defaults"],
		}

		cc_library_static {
		name: "libstagefright_rtsp_player2",

		srcs: ["NetworkUtilsForAppProc.cpp"],
		defaults: ["libstagefright_rtsp_defaults"],
		}

		//###############################################################################

		cc_test {