Merge "audio policy manager: fix BT SCO stream mute"
diff --git a/apex/testing/Android.bp b/apex/testing/Android.bp
index a04ab3f..d86094e 100644
--- a/apex/testing/Android.bp
+++ b/apex/testing/Android.bp
@@ -17,7 +17,10 @@
manifest: "test_manifest.json",
file_contexts: ":com.android.media-file_contexts",
defaults: ["com.android.media-defaults"],
- prebuilts: ["sdkinfo_45"],
+ prebuilts: [
+ "sdkinfo_45",
+ "media-linker-config",
+ ],
installable: false,
}
diff --git a/media/codec2/vndk/C2PlatformStorePluginLoader.cpp b/media/codec2/vndk/C2PlatformStorePluginLoader.cpp
index 4c330e5..bee028a 100644
--- a/media/codec2/vndk/C2PlatformStorePluginLoader.cpp
+++ b/media/codec2/vndk/C2PlatformStorePluginLoader.cpp
@@ -33,7 +33,8 @@
} // unnamed
C2PlatformStorePluginLoader::C2PlatformStorePluginLoader(const char *libPath)
- : mCreateBlockPool(nullptr) {
+ : mCreateBlockPool(nullptr),
+ mCreateAllocator(nullptr) {
mLibHandle = dlopen(libPath, RTLD_NOW | RTLD_NODELETE);
if (mLibHandle == nullptr) {
ALOGD("Failed to load library: %s (%s)", libPath, dlerror());
diff --git a/media/libaaudio/tests/test_aaudio_monkey.cpp b/media/libaaudio/tests/test_aaudio_monkey.cpp
index be54835..cc29678 100644
--- a/media/libaaudio/tests/test_aaudio_monkey.cpp
+++ b/media/libaaudio/tests/test_aaudio_monkey.cpp
@@ -46,11 +46,10 @@
int32_t numFrames);
void AAudioMonkeyErrorCallbackProc(
- AAudioStream *stream __unused,
- void *userData __unused,
- aaudio_result_t error) {
- printf("Error Callback, error: %d\n",(int)error);
-}
+ AAudioStream * /* stream */,
+ void *userData,
+ aaudio_result_t error);
+
// This function is not thread safe. Only use this from a single thread.
double nextRandomDouble() {
@@ -99,6 +98,10 @@
aaudio_stream_state_t state = AAUDIO_STREAM_STATE_UNKNOWN;
aaudio_result_t result = AAudioStream_waitForStateChange(getStream(),
AAUDIO_STREAM_STATE_UNKNOWN, &state, 0);
+ if (result == AAUDIO_ERROR_DISCONNECTED) {
+ printf("WARNING - AAudioStream_waitForStateChange returned DISCONNECTED\n");
+ return true; // OK
+ }
if (result != AAUDIO_OK) {
printf("ERROR - AAudioStream_waitForStateChange returned %d\n", result);
return false;
@@ -114,7 +117,7 @@
(unsigned long long) framesRead,
xRuns);
- if (framesWritten < framesRead) {
+ if (state != AAUDIO_STREAM_STATE_STARTING && framesWritten < framesRead) {
printf("WARNING - UNDERFLOW - diff = %d !!!!!!!!!!!!\n",
(int) (framesWritten - framesRead));
}
@@ -132,8 +135,23 @@
return -1;
}
+ // update and query stream state
+ aaudio_stream_state_t state = AAUDIO_STREAM_STATE_UNKNOWN;
+ state = AAudioStream_getState(getStream());
+ if (state < 0) {
+ printf("ERROR - AAudioStream_getState returned %d\n", state);
+ return state;
+ }
+
+ if (state == AAUDIO_STREAM_STATE_DISCONNECTED) {
+ printf("#%d, Closing disconnected stream.\n", getIndex());
+ result = close();
+ return result;
+ }
+
double dice = nextRandomDouble();
// Select an action based on a weighted probability.
+ printf(" "); // indent action
if (dice < PROB_START) {
printf("start\n");
result = AAudioStream_requestStart(getStream());
@@ -200,6 +218,10 @@
return AAUDIO_CALLBACK_RESULT_CONTINUE;
}
+ int getIndex() const {
+ return mIndex;
+ }
+
private:
const AAudioArgsParser *mArgParser;
const int mIndex;
@@ -223,6 +245,13 @@
return monkey->renderAudio(stream, audioData, numFrames);
}
+void AAudioMonkeyErrorCallbackProc(
+ AAudioStream * /* stream */,
+ void *userData,
+ aaudio_result_t error) {
+ AAudioMonkey *monkey = (AAudioMonkey *) userData;
+ printf("#%d, Error Callback, error: %d\n", monkey->getIndex(), (int)error);
+}
static void usage() {
AAudioArgsParser::usage();
diff --git a/media/libmediatranscoding/transcoder/benchmark/Android.bp b/media/libmediatranscoding/transcoder/benchmark/Android.bp
index c9a7b57..ce34702 100644
--- a/media/libmediatranscoding/transcoder/benchmark/Android.bp
+++ b/media/libmediatranscoding/transcoder/benchmark/Android.bp
@@ -1,6 +1,6 @@
cc_defaults {
name: "benchmarkdefaults",
- shared_libs: ["libmediatranscoder", "libmediandk", "libbase"],
+ shared_libs: ["libmediatranscoder", "libmediandk", "libbase", "libbinder_ndk"],
static_libs: ["libgoogle-benchmark"],
}
diff --git a/media/libmediatranscoding/transcoder/benchmark/MediaTrackTranscoderBenchmark.cpp b/media/libmediatranscoding/transcoder/benchmark/MediaTrackTranscoderBenchmark.cpp
index 94bdcb3..c695ed9 100644
--- a/media/libmediatranscoding/transcoder/benchmark/MediaTrackTranscoderBenchmark.cpp
+++ b/media/libmediatranscoding/transcoder/benchmark/MediaTrackTranscoderBenchmark.cpp
@@ -33,6 +33,7 @@
#define LOG_TAG "MediaTrackTranscoderBenchmark"
#include <android-base/logging.h>
+#include <android/binder_process.h>
#include <benchmark/benchmark.h>
#include <fcntl.h>
#include <media/MediaSampleReader.h>
@@ -216,8 +217,7 @@
};
static std::shared_ptr<AMediaFormat> GetDefaultTrackFormat(MediaType mediaType,
- AMediaFormat* sourceFormat,
- bool maxOperatingRate) {
+ AMediaFormat* sourceFormat) {
// Default video config.
static constexpr int32_t kVideoBitRate = 20 * 1000 * 1000; // 20 mbps
static constexpr float kVideoFrameRate = 30.0f; // 30 fps
@@ -230,11 +230,6 @@
AMediaFormat_setString(format, AMEDIAFORMAT_KEY_MIME, AMEDIA_MIMETYPE_VIDEO_AVC);
AMediaFormat_setInt32(format, AMEDIAFORMAT_KEY_BIT_RATE, kVideoBitRate);
AMediaFormat_setFloat(format, AMEDIAFORMAT_KEY_FRAME_RATE, kVideoFrameRate);
-
- if (maxOperatingRate) {
- AMediaFormat_setFloat(format, AMEDIAFORMAT_KEY_OPERATING_RATE, INT32_MAX);
- AMediaFormat_setInt32(format, AMEDIAFORMAT_KEY_PRIORITY, 1);
- }
}
// nothing for audio.
@@ -283,12 +278,19 @@
}
/**
+ * Callback to edit track format for transcoding.
+ * @param dstFormat The default track format for the track type.
+ */
+using TrackFormatEditCallback = std::function<void(AMediaFormat* dstFormat)>;
+
+/**
* Configures a MediaTrackTranscoder with the provided MediaSampleReader, reading from the first
* track that matches the specified media type.
*/
static bool ConfigureSampleReader(const std::shared_ptr<MediaTrackTranscoder>& transcoder,
const std::shared_ptr<MediaSampleReader>& sampleReader,
- MediaType mediaType, bool maxOperatingRate) {
+ MediaType mediaType,
+ const TrackFormatEditCallback& formatEditor) {
int srcTrackIndex = -1;
std::shared_ptr<AMediaFormat> srcTrackFormat = nullptr;
@@ -318,8 +320,10 @@
return false;
}
- auto destinationFormat =
- GetDefaultTrackFormat(mediaType, srcTrackFormat.get(), maxOperatingRate);
+ auto destinationFormat = GetDefaultTrackFormat(mediaType, srcTrackFormat.get());
+ if (formatEditor != nullptr) {
+ formatEditor(destinationFormat.get());
+ }
status = transcoder->configure(sampleReader, srcTrackIndex, destinationFormat);
if (status != AMEDIA_OK) {
LOG(ERROR) << "transcoder configure returned " << status;
@@ -330,7 +334,11 @@
}
static void BenchmarkTranscoder(benchmark::State& state, const std::string& srcFileName,
- bool mockReader, MediaType mediaType, bool maxOperatingRate) {
+ bool mockReader, MediaType mediaType,
+ const TrackFormatEditCallback& formatEditor = nullptr) {
+ static pthread_once_t once = PTHREAD_ONCE_INIT;
+ pthread_once(&once, ABinderProcess_startThreadPool);
+
for (auto _ : state) {
std::shared_ptr<TrackTranscoderCallbacks> callbacks =
std::make_shared<TrackTranscoderCallbacks>();
@@ -348,7 +356,7 @@
return;
}
- if (!ConfigureSampleReader(transcoder, sampleReader, mediaType, maxOperatingRate)) {
+ if (!ConfigureSampleReader(transcoder, sampleReader, mediaType, formatEditor)) {
state.SkipWithError("Unable to configure the transcoder");
return;
}
@@ -374,56 +382,44 @@
}
}
+static void BenchmarkTranscoderWithOperatingRate(benchmark::State& state,
+ const std::string& srcFile, bool mockReader,
+ MediaType mediaType) {
+ TrackFormatEditCallback editor;
+ const int32_t operatingRate = state.range(0);
+ const int32_t priority = state.range(1);
+
+ if (operatingRate >= 0 && priority >= 0) {
+ editor = [operatingRate, priority](AMediaFormat* format) {
+ AMediaFormat_setInt32(format, AMEDIAFORMAT_KEY_OPERATING_RATE, operatingRate);
+ AMediaFormat_setInt32(format, AMEDIAFORMAT_KEY_PRIORITY, priority);
+ };
+ }
+ BenchmarkTranscoder(state, srcFile, mockReader, mediaType, editor);
+}
+
//-------------------------------- AVC to AVC Benchmarks -------------------------------------------
-static void BM_VideoTranscode_AVC2AVC_NoMuxer(benchmark::State& state) {
+static void BM_VideoTranscode_AVC2AVC(benchmark::State& state) {
const char* srcFile = "video_1920x1080_3648frame_h264_22Mbps_30fps_aac.mp4";
- BenchmarkTranscoder(state, srcFile, false /* mockReader */, kVideo,
- false /* maxOperatingRate */);
+ BenchmarkTranscoderWithOperatingRate(state, srcFile, false /* mockReader */, kVideo);
}
-static void BM_VideoTranscode_AVC2AVC_NoMuxer_NoExtractor(benchmark::State& state) {
+static void BM_VideoTranscode_AVC2AVC_NoExtractor(benchmark::State& state) {
const char* srcFile = "video_1920x1080_3648frame_h264_22Mbps_30fps_aac.mp4";
- BenchmarkTranscoder(state, srcFile, true /* mockReader */, kVideo,
- false /* maxOperatingRate */);
-}
-
-static void BM_VideoTranscode_AVC2AVC_NoMuxer_MaxOperatingRate(benchmark::State& state) {
- const char* srcFile = "video_1920x1080_3648frame_h264_22Mbps_30fps_aac.mp4";
- BenchmarkTranscoder(state, srcFile, false /* mockReader */, kVideo,
- true /* maxOperatingRate */);
-}
-
-static void BM_VideoTranscode_AVC2AVC_NoMuxer_NoExtractor_MaxOperatingRate(
- benchmark::State& state) {
- const char* srcFile = "video_1920x1080_3648frame_h264_22Mbps_30fps_aac.mp4";
- BenchmarkTranscoder(state, srcFile, true /* mockReader */, kVideo, true /* maxOperatingRate */);
+ BenchmarkTranscoderWithOperatingRate(state, srcFile, true /* mockReader */, kVideo);
}
//-------------------------------- HEVC to AVC Benchmarks ------------------------------------------
-static void BM_VideoTranscode_HEVC2AVC_NoMuxer(benchmark::State& state) {
+static void BM_VideoTranscode_HEVC2AVC(benchmark::State& state) {
const char* srcFile = "video_1920x1080_3863frame_hevc_4Mbps_30fps_aac.mp4";
- BenchmarkTranscoder(state, srcFile, false /* mockReader */, kVideo,
- false /* maxOperatingRate */);
+ BenchmarkTranscoderWithOperatingRate(state, srcFile, false /* mockReader */, kVideo);
}
-static void BM_VideoTranscode_HEVC2AVC_NoMuxer_NoExtractor(benchmark::State& state) {
+static void BM_VideoTranscode_HEVC2AVC_NoExtractor(benchmark::State& state) {
const char* srcFile = "video_1920x1080_3863frame_hevc_4Mbps_30fps_aac.mp4";
- BenchmarkTranscoder(state, srcFile, true /* mockReader */, kVideo,
- false /* maxOperatingRate */);
-}
-
-static void BM_VideoTranscode_HEVC2AVC_NoMuxer_MaxOperatingRate(benchmark::State& state) {
- const char* srcFile = "video_1920x1080_3863frame_hevc_4Mbps_30fps_aac.mp4";
- BenchmarkTranscoder(state, srcFile, false /* mockReader */, kVideo,
- true /* maxOperatingRate */);
-}
-
-static void BM_VideoTranscode_HEVC2AVC_NoMuxer_NoExtractor_MaxOperatingRate(
- benchmark::State& state) {
- const char* srcFile = "video_1920x1080_3863frame_hevc_4Mbps_30fps_aac.mp4";
- BenchmarkTranscoder(state, srcFile, true /* mockReader */, kVideo, true /* maxOperatingRate */);
+ BenchmarkTranscoderWithOperatingRate(state, srcFile, true /* mockReader */, kVideo);
}
//-------------------------------- Benchmark Registration ------------------------------------------
@@ -432,14 +428,19 @@
#define TRANSCODER_BENCHMARK(func) \
BENCHMARK(func)->UseRealTime()->MeasureProcessCPUTime()->Unit(benchmark::kMillisecond)
-TRANSCODER_BENCHMARK(BM_VideoTranscode_AVC2AVC_NoMuxer);
-TRANSCODER_BENCHMARK(BM_VideoTranscode_AVC2AVC_NoMuxer_NoExtractor);
-TRANSCODER_BENCHMARK(BM_VideoTranscode_AVC2AVC_NoMuxer_MaxOperatingRate);
-TRANSCODER_BENCHMARK(BM_VideoTranscode_AVC2AVC_NoMuxer_NoExtractor_MaxOperatingRate);
+// Benchmark registration for testing different operating rate and priority combinations.
+#define TRANSCODER_OPERATING_RATE_BENCHMARK(func) \
+ TRANSCODER_BENCHMARK(func) \
+ ->Args({-1, -1}) /* <-- Use default */ \
+ ->Args({240, 0}) \
+ ->Args({INT32_MAX, 0}) \
+ ->Args({240, 1}) \
+ ->Args({INT32_MAX, 1})
-TRANSCODER_BENCHMARK(BM_VideoTranscode_HEVC2AVC_NoMuxer);
-TRANSCODER_BENCHMARK(BM_VideoTranscode_HEVC2AVC_NoMuxer_NoExtractor);
-TRANSCODER_BENCHMARK(BM_VideoTranscode_HEVC2AVC_NoMuxer_MaxOperatingRate);
-TRANSCODER_BENCHMARK(BM_VideoTranscode_HEVC2AVC_NoMuxer_NoExtractor_MaxOperatingRate);
+TRANSCODER_OPERATING_RATE_BENCHMARK(BM_VideoTranscode_AVC2AVC);
+TRANSCODER_OPERATING_RATE_BENCHMARK(BM_VideoTranscode_AVC2AVC_NoExtractor);
+
+TRANSCODER_OPERATING_RATE_BENCHMARK(BM_VideoTranscode_HEVC2AVC);
+TRANSCODER_OPERATING_RATE_BENCHMARK(BM_VideoTranscode_HEVC2AVC_NoExtractor);
BENCHMARK_MAIN();