Merge "Enable audio streaming to a wifi display. Remove startup delay hack." into jb-mr1-dev (66765846) · Commits · e / os / android_frameworks_av

media/libstagefright/wifi-display/source/PlaybackSession.cpp

+4 −4

Original line number	Diff line number	Diff line
		@@ -647,11 +647,10 @@ status_t WifiDisplaySource::PlaybackSession::setupPacketizer() {
		service->connectDisplay(mBufferQueue);
		}

		#if 0
		sp<AudioSource> audioSource = new AudioSource(
		AUDIO_SOURCE_MIC,
		AUDIO_SOURCE_REMOTE_SUBMIX,
		48000 /* sampleRate */,
		2 /* channelCount */); // XXX AUDIO_CHANNEL_IN_STEREO?
		2 /* channelCount */);

		if (audioSource->initCheck() == OK) {
		audioSource->setUseLooperTime(true);
		@@ -670,10 +669,11 @@ status_t WifiDisplaySource::PlaybackSession::setupPacketizer() {
		looper()->registerHandler(converter);

		mTracks.add(index, new Track(converter));

		ALOGI("Successfully instantiated audio source.");
		} else {
		ALOGW("Unable to instantiate audio source");
		}
		#endif
		#endif

		return OK;

+0 −7

Original line number	Diff line number	Diff line
		@@ -275,14 +275,7 @@ status_t Serializer::onStart() {
		}

		if (err == OK) {
		#if 0
		schedulePoll();
		#else
		// XXX the dongle doesn't appear to have setup the RTP connection
		// fully at the time PLAY is called. We have to delay sending data
		// for a little bit.
		schedulePoll(500000ll);
		#endif
		}

		return err;