release-request-847cd524-59e3-47f4-abcd-245220d8141a-for-git_oc-dr1-release-39... (2713e0fc) · Commits · e / os / android_frameworks_av

media/libaudioprocessing/AudioMixer.cpp

+6 −0

Original line number	Diff line number	Diff line
		@@ -302,6 +302,12 @@ bool AudioMixer::setChannelMasks(int name,
		void AudioMixer::track_t::unprepareForDownmix() {
		ALOGV("AudioMixer::unprepareForDownmix(%p)", this);

		if (mPostDownmixReformatBufferProvider != nullptr) {
		// release any buffers held by the mPostDownmixReformatBufferProvider
		// before deallocating the downmixerBufferProvider.
		mPostDownmixReformatBufferProvider->reset();
		}

		mDownmixRequiresFormat = AUDIO_FORMAT_INVALID;
		if (downmixerBufferProvider != NULL) {
		// this track had previously been configured with a downmixer, delete it

media/libstagefright/ACodec.cpp

+71 −12

Original line number	Diff line number	Diff line
		@@ -251,6 +251,7 @@ protected:

		virtual PortMode getPortMode(OMX_U32 portIndex);

		virtual void stateExited();
		virtual bool onMessageReceived(const sp<AMessage> &msg);

		virtual bool onOMXEvent(OMX_EVENTTYPE event, OMX_U32 data1, OMX_U32 data2);
		@@ -553,6 +554,7 @@ ACodec::ACodec()
		mTunneled(false),
		mDescribeColorAspectsIndex((OMX_INDEXTYPE)0),
		mDescribeHDRStaticInfoIndex((OMX_INDEXTYPE)0),
		mStateGeneration(0),
		mVendorExtensionsStatus(kExtensionsUnchecked) {
		mUninitializedState = new UninitializedState(this);
		mLoadedState = new LoadedState(this);
		@@ -5322,6 +5324,10 @@ ACodec::BaseState::PortMode ACodec::BaseState::getPortMode(
		return KEEP_BUFFERS;
		}

		void ACodec::BaseState::stateExited() {
		++mCodec->mStateGeneration;
		}

		bool ACodec::BaseState::onMessageReceived(const sp<AMessage> &msg) {
		switch (msg->what()) {
		case kWhatInputBufferFilled:
		@@ -5398,6 +5404,12 @@ bool ACodec::BaseState::onMessageReceived(const sp<AMessage> &msg) {
		break;
		}

		case ACodec::kWhatForceStateTransition:
		{
		ALOGV("Already transitioned --- ignore");
		break;
		}

		default:
		return false;
		}
		@@ -6988,7 +7000,6 @@ void ACodec::ExecutingState::resume() {

		void ACodec::ExecutingState::stateEntered() {
		ALOGV("[%s] Now Executing", mCodec->mComponentName.c_str());

		mCodec->mRenderTracker.clear(systemTime(CLOCK_MONOTONIC));
		mCodec->processDeferredMessages();
		}
		@@ -7624,6 +7635,30 @@ void ACodec::onSignalEndOfInputStream() {
		mCallback->onSignaledInputEOS(err);
		}

		void ACodec::forceStateTransition(int generation) {
		if (generation != mStateGeneration) {
		ALOGV("Ignoring stale force state transition message: #%d (now #%d)",
		generation, mStateGeneration);
		return;
		}
		ALOGE("State machine stuck");
		// Error must have already been signalled to the client.

		// Deferred messages will be handled at LoadedState at the end of the
		// transition.
		mShutdownInProgress = true;
		// No shutdown complete callback at the end of the transition.
		mExplicitShutdown = false;
		mKeepComponentAllocated = true;

		status_t err = mOMXNode->sendCommand(OMX_CommandStateSet, OMX_StateIdle);
		if (err != OK) {
		// TODO: do some recovery here.
		} else {
		changeState(mExecutingToIdleState);
		}
		}

		bool ACodec::ExecutingState::onOMXFrameRendered(int64_t mediaTimeUs, nsecs_t systemNano) {
		mCodec->onFrameRendered(mediaTimeUs, systemNano);
		return true;
		@@ -7690,7 +7725,14 @@ bool ACodec::OutputPortSettingsChangedState::onMessageReceived(

		switch (msg->what()) {
		case kWhatFlush:
		case kWhatShutdown:
		case kWhatShutdown: {
		if (mCodec->mFatalError) {
		sp<AMessage> msg = new AMessage(ACodec::kWhatForceStateTransition, mCodec);
		msg->setInt32("generation", mCodec->mStateGeneration);
		msg->post(3000000);
		}
		// fall-through
		}
		case kWhatResume:
		case kWhatSetParameters:
		{
		@@ -7703,6 +7745,16 @@ bool ACodec::OutputPortSettingsChangedState::onMessageReceived(
		break;
		}

		case kWhatForceStateTransition:
		{
		int32_t generation = 0;
		CHECK(msg->findInt32("generation", &generation));
		mCodec->forceStateTransition(generation);

		handled = true;
		break;
		}

		default:
		handled = BaseState::onMessageReceived(msg);
		break;
		@@ -7762,15 +7814,7 @@ bool ACodec::OutputPortSettingsChangedState::onOMXEvent(

		if (err != OK) {
		mCodec->signalError(OMX_ErrorUndefined, makeNoSideEffectStatus(err));

		// This is technically not correct, but appears to be
		// the only way to free the component instance.
		// Controlled transitioning from excecuting->idle
		// and idle->loaded seem impossible probably because
		// the output port never finishes re-enabling.
		mCodec->mShutdownInProgress = true;
		mCodec->mKeepComponentAllocated = false;
		mCodec->changeState(mCodec->mLoadedState);
		ALOGE("Error occurred while disabling the output port");
		}

		return true;
		@@ -7795,7 +7839,7 @@ bool ACodec::OutputPortSettingsChangedState::onOMXEvent(
		}

		default:
		return false;
		return BaseState::onOMXEvent(event, data1, data2);
		}
		}

		@@ -7997,6 +8041,11 @@ bool ACodec::FlushingState::onMessageReceived(const sp<AMessage> &msg) {
		case kWhatShutdown:
		{
		mCodec->deferMessage(msg);
		if (mCodec->mFatalError) {
		sp<AMessage> msg = new AMessage(ACodec::kWhatForceStateTransition, mCodec);
		msg->setInt32("generation", mCodec->mStateGeneration);
		msg->post(3000000);
		}
		break;
		}

		@@ -8007,6 +8056,16 @@ bool ACodec::FlushingState::onMessageReceived(const sp<AMessage> &msg) {
		break;
		}

		case kWhatForceStateTransition:
		{
		int32_t generation = 0;
		CHECK(msg->findInt32("generation", &generation));
		mCodec->forceStateTransition(generation);

		handled = true;
		break;
		}

		default:
		handled = BaseState::onMessageReceived(msg);
		break;

media/libstagefright/include/ACodec.h

+6 −0

Original line number	Diff line number	Diff line
		@@ -150,6 +150,7 @@ private:
		kWhatSubmitOutputMetadataBufferIfEOS = 'subm',
		kWhatOMXDied = 'OMXd',
		kWhatReleaseCodecInstance = 'relC',
		kWhatForceStateTransition = 'fstt',
		};

		enum {
		@@ -305,6 +306,8 @@ private:

		std::shared_ptr<ACodecBufferChannel> mBufferChannel;

		int32_t mStateGeneration;

		enum {
		kExtensionsUnchecked,
		kExtensionsNone,
		@@ -569,6 +572,9 @@ private:
		// Send EOS on input stream.
		void onSignalEndOfInputStream();

		// Force EXEC->IDLE->LOADED shutdown sequence if not stale.
		void forceStateTransition(int generation);

		DISALLOW_EVIL_CONSTRUCTORS(ACodec);
		};

media/libstagefright/omx/1.0/OmxStore.cpp

0 → 100644

+68 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2017, The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#include <ios>
		#include <list>

		#include <android-base/logging.h>

		#include "Conversion.h"
		#include "OmxStore.h"

		namespace android {
		namespace hardware {
		namespace media {
		namespace omx {
		namespace V1_0 {
		namespace implementation {

		OmxStore::OmxStore() {
		}

		OmxStore::~OmxStore() {
		}

		Return<void> OmxStore::listServiceAttributes(listServiceAttributes_cb _hidl_cb) {
		_hidl_cb(toStatus(NO_ERROR), hidl_vec<ServiceAttribute>());
		return Void();
		}

		Return<void> OmxStore::getNodePrefix(getNodePrefix_cb _hidl_cb) {
		_hidl_cb(hidl_string());
		return Void();
		}

		Return<void> OmxStore::listRoles(listRoles_cb _hidl_cb) {
		_hidl_cb(hidl_vec<RoleInfo>());
		return Void();
		}

		Return<sp<IOmx>> OmxStore::getOmx(hidl_string const& omxName) {
		return IOmx::tryGetService(omxName);
		}

		// Methods from ::android::hidl::base::V1_0::IBase follow.

		IOmxStore* HIDL_FETCH_IOmxStore(const char* /* name */) {
		return new OmxStore();
		}

		} // namespace implementation
		} // namespace V1_0
		} // namespace omx
		} // namespace media
		} // namespace hardware
		} // namespace android

media/libstagefright/omx/1.0/OmxStore.h

0 → 100644

+63 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2017, The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#ifndef ANDROID_HARDWARE_MEDIA_OMX_V1_0_OMXSTORE_H
		#define ANDROID_HARDWARE_MEDIA_OMX_V1_0_OMXSTORE_H

		#include <hidl/MQDescriptor.h>
		#include <hidl/Status.h>

		#include <android/hardware/media/omx/1.0/IOmxStore.h>

		namespace android {
		namespace hardware {
		namespace media {
		namespace omx {
		namespace V1_0 {
		namespace implementation {

		using ::android::hardware::media::omx::V1_0::IOmxStore;
		using ::android::hardware::media::omx::V1_0::IOmx;
		using ::android::hardware::media::omx::V1_0::Status;
		using ::android::hidl::base::V1_0::IBase;
		using ::android::hardware::hidl_string;
		using ::android::hardware::hidl_vec;
		using ::android::hardware::Return;
		using ::android::hardware::Void;
		using ::android::sp;
		using ::android::wp;

		struct OmxStore : public IOmxStore {
		OmxStore();
		virtual ~OmxStore();

		// Methods from IOmx
		Return<void> listServiceAttributes(listServiceAttributes_cb) override;
		Return<void> getNodePrefix(getNodePrefix_cb) override;
		Return<void> listRoles(listRoles_cb) override;
		Return<sp<IOmx>> getOmx(hidl_string const&) override;
		};

		extern "C" IOmxStore* HIDL_FETCH_IOmxStore(const char* name);

		} // namespace implementation
		} // namespace V1_0
		} // namespace omx
		} // namespace media
		} // namespace hardware
		} // namespace android

		#endif // ANDROID_HARDWARE_MEDIA_OMX_V1_0_OMXSTORE_H