Merge "Remove all traces of wifi display sink implementation and supporting code." into jb-mr2-dev (159ef731) · Commits · e / os / android_frameworks_av

media/libstagefright/wifi-display/Android.mk

+0 −76

Original line number	Diff line number	Diff line
		@@ -4,17 +4,10 @@ include $(CLEAR_VARS)

		LOCAL_SRC_FILES:= \
		ANetworkSession.cpp \
		MediaReceiver.cpp \
		MediaSender.cpp \
		Parameters.cpp \
		ParsedMessage.cpp \
		rtp/RTPAssembler.cpp \
		rtp/RTPReceiver.cpp \
		rtp/RTPSender.cpp \
		sink/DirectRenderer.cpp \
		sink/WifiDisplaySink.cpp \
		SNTPClient.cpp \
		TimeSyncer.cpp \
		source/Converter.cpp \
		source/MediaPuller.cpp \
		source/PlaybackSession.cpp \
		@@ -67,72 +60,3 @@ LOCAL_MODULE:= wfd
		LOCAL_MODULE_TAGS := debug

		include $(BUILD_EXECUTABLE)

		################################################################################

		include $(CLEAR_VARS)

		LOCAL_SRC_FILES:= \
		udptest.cpp \

		LOCAL_SHARED_LIBRARIES:= \
		libbinder \
		libgui \
		libmedia \
		libstagefright \
		libstagefright_foundation \
		libstagefright_wfd \
		libutils \
		liblog \

		LOCAL_MODULE:= udptest

		LOCAL_MODULE_TAGS := debug

		include $(BUILD_EXECUTABLE)

		################################################################################

		include $(CLEAR_VARS)

		LOCAL_SRC_FILES:= \
		rtptest.cpp \

		LOCAL_SHARED_LIBRARIES:= \
		libbinder \
		libgui \
		libmedia \
		libstagefright \
		libstagefright_foundation \
		libstagefright_wfd \
		libutils \
		liblog \

		LOCAL_MODULE:= rtptest

		LOCAL_MODULE_TAGS := debug

		include $(BUILD_EXECUTABLE)

		################################################################################

		include $(CLEAR_VARS)

		LOCAL_SRC_FILES:= \
		nettest.cpp \

		LOCAL_SHARED_LIBRARIES:= \
		libbinder \
		libgui \
		libmedia \
		libstagefright \
		libstagefright_foundation \
		libstagefright_wfd \
		libutils \
		liblog \

		LOCAL_MODULE:= nettest

		LOCAL_MODULE_TAGS := debug

		include $(BUILD_EXECUTABLE)

media/libstagefright/wifi-display/MediaSender.cpp

+0 −16

Original line number	Diff line number	Diff line
		@@ -341,22 +341,6 @@ void MediaSender::onSenderNotify(const sp<AMessage> &msg) {
		break;
		}

		case kWhatInformSender:
		{
		int64_t avgLatencyUs;
		CHECK(msg->findInt64("avgLatencyUs", &avgLatencyUs));

		int64_t maxLatencyUs;
		CHECK(msg->findInt64("maxLatencyUs", &maxLatencyUs));

		sp<AMessage> notify = mNotify->dup();
		notify->setInt32("what", kWhatInformSender);
		notify->setInt64("avgLatencyUs", avgLatencyUs);
		notify->setInt64("maxLatencyUs", maxLatencyUs);
		notify->post();
		break;
		}

		default:
		TRESPASS();
		}

media/libstagefright/wifi-display/MediaSender.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -43,7 +43,6 @@ struct MediaSender : public AHandler {
		kWhatInitDone,
		kWhatError,
		kWhatNetworkStall,
		kWhatInformSender,
		};

		MediaSender(

media/libstagefright/wifi-display/rtp/RTPSender.cpp

+0 −11

Original line number	Diff line number	Diff line
		@@ -767,17 +767,6 @@ status_t RTPSender::parseTSFB(const uint8_t *data, size_t size) {
		}

		status_t RTPSender::parseAPP(const uint8_t *data, size_t size) {
		if (!memcmp("late", &data[8], 4)) {
		int64_t avgLatencyUs = (int64_t)U64_AT(&data[12]);
		int64_t maxLatencyUs = (int64_t)U64_AT(&data[20]);

		sp<AMessage> notify = mNotify->dup();
		notify->setInt32("what", kWhatInformSender);
		notify->setInt64("avgLatencyUs", avgLatencyUs);
		notify->setInt64("maxLatencyUs", maxLatencyUs);
		notify->post();
		}

		return OK;
		}

media/libstagefright/wifi-display/rtp/RTPSender.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -37,7 +37,6 @@ struct RTPSender : public RTPBase, public AHandler {
		kWhatInitDone,
		kWhatError,
		kWhatNetworkStall,
		kWhatInformSender,
		};
		RTPSender(
		const sp<ANetworkSession> &netSession,