Merge "Benchmark: Use threadpool for multiple iterations" (7783c5b9) · Commits · e / os / android_frameworks_av

media/tests/benchmark/MediaBenchmarkTest/Android.bp

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -69,7 +69,6 @@ android_library {
	java_defaults {		java_defaults {
	name: "MediaBenchmark-defaults",		name: "MediaBenchmark-defaults",

	sdk_version: "system_current",
	min_sdk_version: "28",		min_sdk_version: "28",
	target_sdk_version: "29",		target_sdk_version: "30",
	}		}

media/tests/benchmark/MediaBenchmarkTest/build.gradle

+10 −10

Original line number	Original line	Diff line number	Diff line
	@@ -17,21 +17,21 @@
	buildscript {		buildscript {
	repositories {		repositories {
	google()		google()
	jcenter()		mavenCentral()
	}		}
	dependencies {		dependencies {
	classpath 'com.android.tools.build:gradle:3.5.0'		classpath 'com.android.tools.build:gradle:4.2.1'
	}		}
	}		}

	apply plugin: 'com.android.application'		apply plugin: 'com.android.application'

	android {		android {
	compileSdkVersion 29		compileSdkVersion 30
	defaultConfig {		defaultConfig {
	applicationId "com.android.media.benchmark"		applicationId "com.android.media.benchmark"
	minSdkVersion 28		minSdkVersion 28
	targetSdkVersion 29		targetSdkVersion 30
	versionCode 1		versionCode 1
	versionName "1.0"		versionName "1.0"
	testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
	@@ -57,20 +57,20 @@ android {
	externalNativeBuild {		externalNativeBuild {
	cmake {		cmake {
	path "src/main/cpp/CMakeLists.txt"		path "src/main/cpp/CMakeLists.txt"
	version "3.10.2"		version "3.18.1"
	}		}
	}		}
	}		}

	repositories {		repositories {
	google()		google()
	jcenter()		mavenCentral()
	}		}

	dependencies {		dependencies {
	implementation fileTree(dir: 'libs', include: ['*.jar'])		implementation fileTree(dir: 'libs', include: ['*.jar'])
	implementation 'androidx.appcompat:appcompat:1.1.0'		implementation 'androidx.appcompat:appcompat:1.3.0'
	testImplementation 'junit:junit:4.12'		testImplementation 'junit:junit:4.13.2'
	androidTestImplementation 'androidx.test:runner:1.2.0'		androidTestImplementation 'androidx.test:runner:1.3.0'
	androidTestImplementation 'androidx.test.ext:junit:1.1.1'		androidTestImplementation 'androidx.test.ext:junit:1.1.2'
	}		}
			No newline at end of file

media/tests/benchmark/MediaBenchmarkTest/src/main/cpp/Android.bp

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -9,7 +9,6 @@ package {

	cc_test_library {		cc_test_library {
	name: "libmediabenchmark_jni",		name: "libmediabenchmark_jni",
	sdk_version: "current",

	defaults: [		defaults: [
	"libmediabenchmark_common-defaults",		"libmediabenchmark_common-defaults",

media/tests/benchmark/src/native/common/Android.bp

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -55,7 +55,6 @@ cc_defaults {

	cc_defaults {		cc_defaults {
	name: "libmediabenchmark-defaults",		name: "libmediabenchmark-defaults",
	sdk_version: "current",
	stl: "c++_shared",		stl: "c++_shared",

	shared_libs: [		shared_libs: [

media/tests/benchmark/src/native/extractor/Extractor.cpp

+1 −3

Original line number	Original line	Diff line number	Diff line
	@@ -124,9 +124,7 @@ void Extractor::deInitExtractor() {

	int64_t sTime = mStats->getCurTime();		int64_t sTime = mStats->getCurTime();
	if (mExtractor) {		if (mExtractor) {
	// TODO: (b/140128505) Multiple calls result in DoS.		AMediaExtractor_delete(mExtractor);
	// Uncomment call to AMediaExtractor_delete() once this is resolved
	// AMediaExtractor_delete(mExtractor);
	mExtractor = nullptr;		mExtractor = nullptr;
	}		}
	int64_t eTime = mStats->getCurTime();		int64_t eTime = mStats->getCurTime();