media: switch to new AMessage handling (1d15ab58) · Commits · e / os / android_frameworks_av

cmds/stagefright/SimplePlayer.cpp

+7 −7

Original line number	Diff line number	Diff line
		@@ -59,14 +59,14 @@ status_t PostAndAwaitResponse(
		return err;
		}
		status_t SimplePlayer::setDataSource(const char *path) {
		sp<AMessage> msg = new AMessage(kWhatSetDataSource, id());
		sp<AMessage> msg = new AMessage(kWhatSetDataSource, this);
		msg->setString("path", path);
		sp<AMessage> response;
		return PostAndAwaitResponse(msg, &response);
		}

		status_t SimplePlayer::setSurface(const sp<IGraphicBufferProducer> &bufferProducer) {
		sp<AMessage> msg = new AMessage(kWhatSetSurface, id());
		sp<AMessage> msg = new AMessage(kWhatSetSurface, this);

		sp<Surface> surface;
		if (bufferProducer != NULL) {
		@@ -81,25 +81,25 @@ status_t SimplePlayer::setSurface(const sp<IGraphicBufferProducer> &bufferProduc
		}

		status_t SimplePlayer::prepare() {
		sp<AMessage> msg = new AMessage(kWhatPrepare, id());
		sp<AMessage> msg = new AMessage(kWhatPrepare, this);
		sp<AMessage> response;
		return PostAndAwaitResponse(msg, &response);
		}

		status_t SimplePlayer::start() {
		sp<AMessage> msg = new AMessage(kWhatStart, id());
		sp<AMessage> msg = new AMessage(kWhatStart, this);
		sp<AMessage> response;
		return PostAndAwaitResponse(msg, &response);
		}

		status_t SimplePlayer::stop() {
		sp<AMessage> msg = new AMessage(kWhatStop, id());
		sp<AMessage> msg = new AMessage(kWhatStop, this);
		sp<AMessage> response;
		return PostAndAwaitResponse(msg, &response);
		}

		status_t SimplePlayer::reset() {
		sp<AMessage> msg = new AMessage(kWhatReset, id());
		sp<AMessage> msg = new AMessage(kWhatReset, this);
		sp<AMessage> response;
		return PostAndAwaitResponse(msg, &response);
		}
		@@ -382,7 +382,7 @@ status_t SimplePlayer::onStart() {

		mStartTimeRealUs = -1ll;

		sp<AMessage> msg = new AMessage(kWhatDoMoreStuff, id());
		sp<AMessage> msg = new AMessage(kWhatDoMoreStuff, this);
		msg->setInt32("generation", ++mDoMoreStuffGeneration);
		msg->post();

cmds/stagefright/sf2.cpp

+6 −6

Original line number	Diff line number	Diff line
		@@ -72,7 +72,7 @@ struct Controller : public AHandler {
		}

		void startAsync() {
		(new AMessage(kWhatStart, id()))->post();
		(new AMessage(kWhatStart, this))->post();
		}

		protected:
		@@ -100,7 +100,7 @@ protected:
		if (ctrlc) {
		printf("\n");
		printStatistics();
		(new AMessage(kWhatStop, id()))->post();
		(new AMessage(kWhatStop, this))->post();
		ctrlc = false;
		}
		switch (msg->what()) {
		@@ -149,7 +149,7 @@ protected:
		mDecodeLooper->registerHandler(mCodec);

		mCodec->setNotificationMessage(
		new AMessage(kWhatCodecNotify, id()));
		new AMessage(kWhatCodecNotify, this));

		sp<AMessage> format = makeFormat(mSource->getFormat());

		@@ -168,7 +168,7 @@ protected:
		mFinalResult = OK;
		mSeekState = SEEK_NONE;

		// (new AMessage(kWhatSeek, id()))->post(5000000ll);
		// (new AMessage(kWhatSeek, this))->post(5000000ll);
		break;
		}

		@@ -225,12 +225,12 @@ protected:
		printf((what == CodecBase::kWhatEOS) ? "$\n" : "E\n");

		printStatistics();
		(new AMessage(kWhatStop, id()))->post();
		(new AMessage(kWhatStop, this))->post();
		} else if (what == CodecBase::kWhatFlushCompleted) {
		mSeekState = SEEK_FLUSH_COMPLETED;
		mCodec->signalResume();

		(new AMessage(kWhatSeek, id()))->post(5000000ll);
		(new AMessage(kWhatSeek, this))->post(5000000ll);
		} else if (what == CodecBase::kWhatOutputFormatChanged) {
		} else if (what == CodecBase::kWhatShutdownCompleted) {
		mDecodeLooper->unregisterHandler(mCodec->id());

media/libmediaplayerservice/nuplayer/GenericSource.cpp

+17 −17

Original line number	Diff line number	Diff line
		@@ -334,7 +334,7 @@ void NuPlayer::GenericSource::prepareAsync() {
		mLooper->registerHandler(this);
		}

		sp<AMessage> msg = new AMessage(kWhatPrepareAsync, id());
		sp<AMessage> msg = new AMessage(kWhatPrepareAsync, this);
		msg->post();
		}

		@@ -393,7 +393,7 @@ void NuPlayer::GenericSource::onPrepareAsync() {
		status_t err = prefillCacheIfNecessary();
		if (err != OK) {
		if (err == -EAGAIN) {
		(new AMessage(kWhatPrepareAsync, id()))->post(200000);
		(new AMessage(kWhatPrepareAsync, this))->post(200000);
		} else {
		ALOGE("Failed to prefill data cache!");
		notifyPreparedAndCleanup(UNKNOWN_ERROR);
		@@ -538,7 +538,7 @@ void NuPlayer::GenericSource::start() {
		setDrmPlaybackStatusIfNeeded(Playback::START, getLastReadPosition() / 1000);
		mStarted = true;

		(new AMessage(kWhatStart, id()))->post();
		(new AMessage(kWhatStart, this))->post();
		}

		void NuPlayer::GenericSource::stop() {
		@@ -547,7 +547,7 @@ void NuPlayer::GenericSource::stop() {
		mStarted = false;
		if (mIsWidevine \|\| mIsSecure) {
		// For widevine or secure sources we need to prevent any further reads.
		sp<AMessage> msg = new AMessage(kWhatStopWidevine, id());
		sp<AMessage> msg = new AMessage(kWhatStopWidevine, this);
		sp<AMessage> response;
		(void) msg->postAndAwaitResponse(&response);
		}
		@@ -564,7 +564,7 @@ void NuPlayer::GenericSource::resume() {
		setDrmPlaybackStatusIfNeeded(Playback::START, getLastReadPosition() / 1000);
		mStarted = true;

		(new AMessage(kWhatResume, id()))->post();
		(new AMessage(kWhatResume, this))->post();
		}

		void NuPlayer::GenericSource::disconnect() {
		@@ -591,7 +591,7 @@ status_t NuPlayer::GenericSource::feedMoreTSData() {
		}

		void NuPlayer::GenericSource::schedulePollBuffering() {
		sp<AMessage> msg = new AMessage(kWhatPollBuffering, id());
		sp<AMessage> msg = new AMessage(kWhatPollBuffering, this);
		msg->setInt32("generation", mPollBufferingGeneration);
		msg->post(1000000ll);
		}
		@@ -928,7 +928,7 @@ void NuPlayer::GenericSource::fetchTextData(
		const int64_t oneSecUs = 1000000ll;
		delayUs -= oneSecUs;
		}
		sp<AMessage> msg2 = new AMessage(sendWhat, id());
		sp<AMessage> msg2 = new AMessage(sendWhat, this);
		msg2->setInt32("generation", msgGeneration);
		msg2->post(delayUs < 0 ? 0 : delayUs);
		}
		@@ -968,7 +968,7 @@ void NuPlayer::GenericSource::sendTextData(
		}

		sp<MetaData> NuPlayer::GenericSource::getFormatMeta(bool audio) {
		sp<AMessage> msg = new AMessage(kWhatGetFormat, id());
		sp<AMessage> msg = new AMessage(kWhatGetFormat, this);
		msg->setInt32("audio", audio);

		sp<AMessage> response;
		@@ -1057,7 +1057,7 @@ status_t NuPlayer::GenericSource::dequeueAccessUnit(

		if (mSubtitleTrack.mSource != NULL
		&& !mSubtitleTrack.mPackets->hasBufferAvailable(&eosResult)) {
		sp<AMessage> msg = new AMessage(kWhatFetchSubtitleData, id());
		sp<AMessage> msg = new AMessage(kWhatFetchSubtitleData, this);
		msg->setInt64("timeUs", timeUs);
		msg->setInt32("generation", mFetchSubtitleDataGeneration);
		msg->post();
		@@ -1065,7 +1065,7 @@ status_t NuPlayer::GenericSource::dequeueAccessUnit(

		if (mTimedTextTrack.mSource != NULL
		&& !mTimedTextTrack.mPackets->hasBufferAvailable(&eosResult)) {
		sp<AMessage> msg = new AMessage(kWhatFetchTimedTextData, id());
		sp<AMessage> msg = new AMessage(kWhatFetchTimedTextData, this);
		msg->setInt64("timeUs", timeUs);
		msg->setInt32("generation", mFetchTimedTextDataGeneration);
		msg->post();
		@@ -1130,7 +1130,7 @@ sp<AMessage> NuPlayer::GenericSource::getTrackInfo(size_t trackIndex) const {
		}

		ssize_t NuPlayer::GenericSource::getSelectedTrack(media_track_type type) const {
		sp<AMessage> msg = new AMessage(kWhatGetSelectedTrack, id());
		sp<AMessage> msg = new AMessage(kWhatGetSelectedTrack, this);
		msg->setInt32("type", type);

		sp<AMessage> response;
		@@ -1186,7 +1186,7 @@ ssize_t NuPlayer::GenericSource::doGetSelectedTrack(media_track_type type) const

		status_t NuPlayer::GenericSource::selectTrack(size_t trackIndex, bool select, int64_t timeUs) {
		ALOGV("%s track: %zu", select ? "select" : "deselect", trackIndex);
		sp<AMessage> msg = new AMessage(kWhatSelectTrack, id());
		sp<AMessage> msg = new AMessage(kWhatSelectTrack, this);
		msg->setInt32("trackIndex", trackIndex);
		msg->setInt32("select", select);
		msg->setInt64("timeUs", timeUs);
		@@ -1272,7 +1272,7 @@ status_t NuPlayer::GenericSource::doSelectTrack(size_t trackIndex, bool select,
		status_t eosResult; // ignored
		if (mSubtitleTrack.mSource != NULL
		&& !mSubtitleTrack.mPackets->hasBufferAvailable(&eosResult)) {
		sp<AMessage> msg = new AMessage(kWhatFetchSubtitleData, id());
		sp<AMessage> msg = new AMessage(kWhatFetchSubtitleData, this);
		msg->setInt64("timeUs", timeUs);
		msg->setInt32("generation", mFetchSubtitleDataGeneration);
		msg->post();
		@@ -1280,7 +1280,7 @@ status_t NuPlayer::GenericSource::doSelectTrack(size_t trackIndex, bool select,

		if (mTimedTextTrack.mSource != NULL
		&& !mTimedTextTrack.mPackets->hasBufferAvailable(&eosResult)) {
		sp<AMessage> msg = new AMessage(kWhatFetchTimedTextData, id());
		sp<AMessage> msg = new AMessage(kWhatFetchTimedTextData, this);
		msg->setInt64("timeUs", timeUs);
		msg->setInt32("generation", mFetchTimedTextDataGeneration);
		msg->post();
		@@ -1294,7 +1294,7 @@ status_t NuPlayer::GenericSource::doSelectTrack(size_t trackIndex, bool select,
		return OK;
		}

		sp<AMessage> msg = new AMessage(kWhatChangeAVSource, id());
		sp<AMessage> msg = new AMessage(kWhatChangeAVSource, this);
		msg->setInt32("trackIndex", trackIndex);
		msg->post();
		return OK;
		@@ -1304,7 +1304,7 @@ status_t NuPlayer::GenericSource::doSelectTrack(size_t trackIndex, bool select,
		}

		status_t NuPlayer::GenericSource::seekTo(int64_t seekTimeUs) {
		sp<AMessage> msg = new AMessage(kWhatSeek, id());
		sp<AMessage> msg = new AMessage(kWhatSeek, this);
		msg->setInt64("seekTimeUs", seekTimeUs);

		sp<AMessage> response;
		@@ -1444,7 +1444,7 @@ void NuPlayer::GenericSource::postReadBuffer(media_track_type trackType) {

		if ((mPendingReadBufferTypes & (1 << trackType)) == 0) {
		mPendingReadBufferTypes \|= (1 << trackType);
		sp<AMessage> msg = new AMessage(kWhatReadBuffer, id());
		sp<AMessage> msg = new AMessage(kWhatReadBuffer, this);
		msg->setInt32("trackType", trackType);
		msg->post();
		}

media/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -81,7 +81,7 @@ void NuPlayer::HTTPLiveSource::prepareAsync() {
		mLiveLooper->registerHandler(this);
		}

		sp<AMessage> notify = new AMessage(kWhatSessionNotify, id());
		sp<AMessage> notify = new AMessage(kWhatSessionNotify, this);

		mLiveSession = new LiveSession(
		notify,
		@@ -153,7 +153,7 @@ status_t NuPlayer::HTTPLiveSource::selectTrack(size_t trackIndex, bool select, i
		if (err == OK) {
		mFetchSubtitleDataGeneration++;
		if (select) {
		sp<AMessage> msg = new AMessage(kWhatFetchSubtitleData, id());
		sp<AMessage> msg = new AMessage(kWhatFetchSubtitleData, this);
		msg->setInt32("generation", mFetchSubtitleDataGeneration);
		msg->post();
		}

media/libmediaplayerservice/nuplayer/NuPlayer.cpp

+23 −23

Original line number	Diff line number	Diff line
		@@ -200,9 +200,9 @@ void NuPlayer::setDriver(const wp<NuPlayerDriver> &driver) {
		}

		void NuPlayer::setDataSourceAsync(const sp<IStreamSource> &source) {
		sp<AMessage> msg = new AMessage(kWhatSetDataSource, id());
		sp<AMessage> msg = new AMessage(kWhatSetDataSource, this);

		sp<AMessage> notify = new AMessage(kWhatSourceNotify, id());
		sp<AMessage> notify = new AMessage(kWhatSourceNotify, this);

		msg->setObject("source", new StreamingSource(notify, source));
		msg->post();
		@@ -230,10 +230,10 @@ void NuPlayer::setDataSourceAsync(
		const char *url,
		const KeyedVector<String8, String8> *headers) {

		sp<AMessage> msg = new AMessage(kWhatSetDataSource, id());
		sp<AMessage> msg = new AMessage(kWhatSetDataSource, this);
		size_t len = strlen(url);

		sp<AMessage> notify = new AMessage(kWhatSourceNotify, id());
		sp<AMessage> notify = new AMessage(kWhatSourceNotify, this);

		sp<Source> source;
		if (IsHTTPLiveURL(url)) {
		@@ -267,9 +267,9 @@ void NuPlayer::setDataSourceAsync(
		}

		void NuPlayer::setDataSourceAsync(int fd, int64_t offset, int64_t length) {
		sp<AMessage> msg = new AMessage(kWhatSetDataSource, id());
		sp<AMessage> msg = new AMessage(kWhatSetDataSource, this);

		sp<AMessage> notify = new AMessage(kWhatSourceNotify, id());
		sp<AMessage> notify = new AMessage(kWhatSourceNotify, this);

		sp<GenericSource> source =
		new GenericSource(notify, mUIDValid, mUID);
		@@ -286,12 +286,12 @@ void NuPlayer::setDataSourceAsync(int fd, int64_t offset, int64_t length) {
		}

		void NuPlayer::prepareAsync() {
		(new AMessage(kWhatPrepare, id()))->post();
		(new AMessage(kWhatPrepare, this))->post();
		}

		void NuPlayer::setVideoSurfaceTextureAsync(
		const sp<IGraphicBufferProducer> &bufferProducer) {
		sp<AMessage> msg = new AMessage(kWhatSetVideoNativeWindow, id());
		sp<AMessage> msg = new AMessage(kWhatSetVideoNativeWindow, this);

		if (bufferProducer == NULL) {
		msg->setObject("native-window", NULL);
		@@ -306,23 +306,23 @@ void NuPlayer::setVideoSurfaceTextureAsync(
		}

		void NuPlayer::setAudioSink(const sp<MediaPlayerBase::AudioSink> &sink) {
		sp<AMessage> msg = new AMessage(kWhatSetAudioSink, id());
		sp<AMessage> msg = new AMessage(kWhatSetAudioSink, this);
		msg->setObject("sink", sink);
		msg->post();
		}

		void NuPlayer::start() {
		(new AMessage(kWhatStart, id()))->post();
		(new AMessage(kWhatStart, this))->post();
		}

		void NuPlayer::setPlaybackRate(float rate) {
		sp<AMessage> msg = new AMessage(kWhatSetRate, id());
		sp<AMessage> msg = new AMessage(kWhatSetRate, this);
		msg->setFloat("rate", rate);
		msg->post();
		}

		void NuPlayer::pause() {
		(new AMessage(kWhatPause, id()))->post();
		(new AMessage(kWhatPause, this))->post();
		}

		void NuPlayer::resetAsync() {
		@@ -336,11 +336,11 @@ void NuPlayer::resetAsync() {
		mSource->disconnect();
		}

		(new AMessage(kWhatReset, id()))->post();
		(new AMessage(kWhatReset, this))->post();
		}

		void NuPlayer::seekToAsync(int64_t seekTimeUs, bool needNotify) {
		sp<AMessage> msg = new AMessage(kWhatSeek, id());
		sp<AMessage> msg = new AMessage(kWhatSeek, this);
		msg->setInt64("seekTimeUs", seekTimeUs);
		msg->setInt32("needNotify", needNotify);
		msg->post();
		@@ -1061,7 +1061,7 @@ void NuPlayer::onStart() {
		flags \|= Renderer::FLAG_OFFLOAD_AUDIO;
		}

		sp<AMessage> notify = new AMessage(kWhatRendererNotify, id());
		sp<AMessage> notify = new AMessage(kWhatRendererNotify, this);
		++mRendererGeneration;
		notify->setInt32("generation", mRendererGeneration);
		mRenderer = new Renderer(mAudioSink, notify, flags);
		@@ -1177,7 +1177,7 @@ void NuPlayer::postScanSources() {
		return;
		}

		sp<AMessage> msg = new AMessage(kWhatScanSources, id());
		sp<AMessage> msg = new AMessage(kWhatScanSources, this);
		msg->setInt32("generation", mScanSourcesGeneration);
		msg->post();

		@@ -1219,7 +1219,7 @@ status_t NuPlayer::instantiateDecoder(bool audio, sp<DecoderBase> *decoder) {
		AString mime;
		CHECK(format->findString("mime", &mime));

		sp<AMessage> ccNotify = new AMessage(kWhatClosedCaptionNotify, id());
		sp<AMessage> ccNotify = new AMessage(kWhatClosedCaptionNotify, this);
		if (mCCDecoder == NULL) {
		mCCDecoder = new CCDecoder(ccNotify);
		}
		@@ -1234,7 +1234,7 @@ status_t NuPlayer::instantiateDecoder(bool audio, sp<DecoderBase> *decoder) {
		}

		if (audio) {
		sp<AMessage> notify = new AMessage(kWhatAudioNotify, id());
		sp<AMessage> notify = new AMessage(kWhatAudioNotify, this);
		++mAudioDecoderGeneration;
		notify->setInt32("generation", mAudioDecoderGeneration);

		@@ -1244,7 +1244,7 @@ status_t NuPlayer::instantiateDecoder(bool audio, sp<DecoderBase> *decoder) {
		*decoder = new Decoder(notify, mSource, mRenderer);
		}
		} else {
		sp<AMessage> notify = new AMessage(kWhatVideoNotify, id());
		sp<AMessage> notify = new AMessage(kWhatVideoNotify, this);
		++mVideoDecoderGeneration;
		notify->setInt32("generation", mVideoDecoderGeneration);

		@@ -1435,7 +1435,7 @@ status_t NuPlayer::setVideoScalingMode(int32_t mode) {
		}

		status_t NuPlayer::getTrackInfo(Parcel* reply) const {
		sp<AMessage> msg = new AMessage(kWhatGetTrackInfo, id());
		sp<AMessage> msg = new AMessage(kWhatGetTrackInfo, this);
		msg->setPointer("reply", reply);

		sp<AMessage> response;
		@@ -1444,7 +1444,7 @@ status_t NuPlayer::getTrackInfo(Parcel* reply) const {
		}

		status_t NuPlayer::getSelectedTrack(int32_t type, Parcel* reply) const {
		sp<AMessage> msg = new AMessage(kWhatGetSelectedTrack, id());
		sp<AMessage> msg = new AMessage(kWhatGetSelectedTrack, this);
		msg->setPointer("reply", reply);
		msg->setInt32("type", type);

		@@ -1457,7 +1457,7 @@ status_t NuPlayer::getSelectedTrack(int32_t type, Parcel* reply) const {
		}

		status_t NuPlayer::selectTrack(size_t trackIndex, bool select, int64_t timeUs) {
		sp<AMessage> msg = new AMessage(kWhatSelectTrack, id());
		sp<AMessage> msg = new AMessage(kWhatSelectTrack, this);
		msg->setSize("trackIndex", trackIndex);
		msg->setInt32("select", select);
		msg->setInt64("timeUs", timeUs);
		@@ -1500,7 +1500,7 @@ sp<MetaData> NuPlayer::getFileMeta() {
		}

		void NuPlayer::schedulePollDuration() {
		sp<AMessage> msg = new AMessage(kWhatPollDuration, id());
		sp<AMessage> msg = new AMessage(kWhatPollDuration, this);
		msg->setInt32("generation", mPollDurationGeneration);
		msg->post();
		}