Snap for 6197114 from 499d7b957ae2472b60f90a21cae7c47a94851257 to rvc-release (1d6dafaf) · Commits · e / os / android_frameworks_av

media/codec2/TEST_MAPPING

+6 −21

Original line number	Diff line number	Diff line
		{
		"presubmit": [
		"postsubmit": [
		{
		"name": "GtsMediaTestCases",
		// TODO: move to presubmit once we verify the tests are not flaky
		"name": "CtsMediaTestCases",
		"options": [
		{
		"include-annotation": "android.platform.test.annotations.Presubmit"
		},
		{
		"include-filter": "com.google.android.media.gts.WidevineGenericOpsTests"
		"exclude-annotation": "android.platform.test.annotations.RequiresDevice"
		}
		]
		},
		{
		"name": "GtsExoPlayerTestCases",
		"options" : [
		{
		"include-annotation": "android.platform.test.annotations.SocPresubmit"
		},
		{
		"include-filter": "com.google.android.exoplayer.gts.DashTest#testWidevine23FpsH264Fixed"
		}
		]
		}
		],
		"imports": [
		{
		"path": "frameworks/av/drm/mediadrm/plugins"
		}
		]
		}

media/codec2/hidl/1.0/utils/InputSurfaceConnection.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -160,12 +160,12 @@ struct InputSurfaceConnection::Impl : public ComponentWrapper {
		return false;
		}
		for (int32_t i = 0; i < kBufferCount; ++i) {
		if (!mSource->onInputBufferAdded(i).isOk()) {
		if (mSource->onInputBufferAdded(i) != OK) {
		LOG(WARNING) << "Impl::init: failed to populate GBS slots.";
		return false;
		}
		}
		if (!mSource->start().isOk()) {
		if (mSource->start() != OK) {
		LOG(WARNING) << "Impl::init -- GBS failed to start.";
		return false;
		}

media/codec2/sfplugin/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -45,7 +45,7 @@ cc_library_shared {
		"libmedia_codeclist",
		"libmedia_omx",
		"libsfplugin_ccodec_utils",
		"libstagefright_bufferqueue_helper",
		"libstagefright_bufferqueue_helper_client",
		"libstagefright_codecbase",
		"libstagefright_foundation",
		"libstagefright_omx",

media/extractors/midi/Android.bp

+4 −4

Original line number	Diff line number	Diff line
		@@ -11,8 +11,8 @@ cc_library {
		static_libs: [
		"libmedia_midiiowrapper",
		"libsonivox",
		"libstagefright_foundation"
		],


		"libstagefright_foundation",
		"libwatchdog",
		"libbase",
		]
		}

media/extractors/midi/MidiExtractor.cpp

+12 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@
		#include <media/stagefright/MediaDefs.h>
		#include <media/stagefright/MediaErrors.h>
		#include <libsonivox/eas_reverb.h>
		#include <watchdog/Watchdog.h>

		namespace android {

		@@ -116,6 +117,7 @@ media_status_t MidiSource::read(
		MediaBufferHelper *outBuffer, const ReadOptions options)
		{
		ALOGV("MidiSource::read");

		MediaBufferHelper *buffer;
		// process an optional seek request
		int64_t seekTimeUs;
		@@ -139,6 +141,8 @@ status_t MidiSource::init()
		}

		// MidiEngine
		using namespace std::chrono_literals;
		static constexpr auto kTimeout = 10s;

		MidiEngine::MidiEngine(CDataSource *dataSource,
		AMediaFormat *fileMetadata,
		@@ -147,6 +151,8 @@ MidiEngine::MidiEngine(CDataSource *dataSource,
		mEasHandle(NULL),
		mEasConfig(NULL),
		mIsInitialized(false) {
		Watchdog watchdog(kTimeout);

		mIoWrapper = new MidiIoWrapper(dataSource);
		// spin up a new EAS engine
		EAS_I32 temp;
		@@ -186,6 +192,8 @@ MidiEngine::MidiEngine(CDataSource *dataSource,
		}

		MidiEngine::~MidiEngine() {
		Watchdog watchdog(kTimeout);

		if (mEasHandle) {
		EAS_CloseFile(mEasData, mEasHandle);
		}
		@@ -217,12 +225,16 @@ status_t MidiEngine::releaseBuffers() {
		}

		status_t MidiEngine::seekTo(int64_t positionUs) {
		Watchdog watchdog(kTimeout);

		ALOGV("seekTo %lld", (long long)positionUs);
		EAS_RESULT result = EAS_Locate(mEasData, mEasHandle, positionUs / 1000, false);
		return result == EAS_SUCCESS ? OK : UNKNOWN_ERROR;
		}

		MediaBufferHelper* MidiEngine::readBuffer() {
		Watchdog watchdog(kTimeout);

		EAS_STATE state;
		EAS_State(mEasData, mEasHandle, &state);
		if ((state == EAS_STATE_STOPPED) \|\| (state == EAS_STATE_ERROR)) {