Merge "Move mediaextractor seccomp policy into apex" into qt-dev
diff --git a/apex/manifest.json b/apex/manifest.json
index cee94e2..03b9dd0 100644
--- a/apex/manifest.json
+++ b/apex/manifest.json
@@ -1,4 +1,4 @@
{
"name": "com.android.media",
- "version": 210000000
+ "version": 220000000
}
diff --git a/apex/manifest_codec.json b/apex/manifest_codec.json
index b83e65a..58ce868 100644
--- a/apex/manifest_codec.json
+++ b/apex/manifest_codec.json
@@ -1,4 +1,4 @@
{
"name": "com.android.media.swcodec",
- "version": 210000000
+ "version": 220000000
}
diff --git a/drm/libmediadrm/CryptoHal.cpp b/drm/libmediadrm/CryptoHal.cpp
index 4dda5d7..d62ccd6 100644
--- a/drm/libmediadrm/CryptoHal.cpp
+++ b/drm/libmediadrm/CryptoHal.cpp
@@ -301,7 +301,7 @@
ssize_t offset;
size_t size;
- if (memory == NULL && buffer == NULL) {
+ if (memory == NULL || buffer == NULL) {
return UNEXPECTED_NULL;
}
diff --git a/media/bufferpool/1.0/Connection.cpp b/media/bufferpool/1.0/Connection.cpp
index e58f595..be89701 100644
--- a/media/bufferpool/1.0/Connection.cpp
+++ b/media/bufferpool/1.0/Connection.cpp
@@ -32,14 +32,22 @@
status = mAccessor->fetch(
mConnectionId, transactionId, bufferId, &handle);
if (status == ResultStatus::OK) {
- _hidl_cb(status, Buffer{bufferId, handle});
+ Buffer buffer = {};
+ buffer.id = bufferId;
+ buffer.buffer = handle;
+ _hidl_cb(status, buffer);
return Void();
}
} else {
mAccessor->cleanUp(false);
}
}
- _hidl_cb(status, Buffer{0, nullptr});
+
+ Buffer buffer = {};
+ buffer.id = 0;
+ buffer.buffer = nullptr;
+
+ _hidl_cb(status, buffer);
return Void();
}
diff --git a/media/bufferpool/2.0/Connection.cpp b/media/bufferpool/2.0/Connection.cpp
index 6bd0e79..57d0c7e 100644
--- a/media/bufferpool/2.0/Connection.cpp
+++ b/media/bufferpool/2.0/Connection.cpp
@@ -32,14 +32,22 @@
status = mAccessor->fetch(
mConnectionId, transactionId, bufferId, &handle);
if (status == ResultStatus::OK) {
- _hidl_cb(status, Buffer{bufferId, handle});
+ Buffer buffer = {};
+ buffer.id = bufferId;
+ buffer.buffer = handle;
+ _hidl_cb(status, buffer);
return Void();
}
} else {
mAccessor->cleanUp(false);
}
}
- _hidl_cb(status, Buffer{0, nullptr});
+
+ Buffer buffer = {};
+ buffer.id = 0;
+ buffer.buffer = nullptr;
+
+ _hidl_cb(status, buffer);
return Void();
}
diff --git a/media/libaaudio/src/legacy/AudioStreamRecord.cpp b/media/libaaudio/src/legacy/AudioStreamRecord.cpp
index 4a65fc9..71efc30 100644
--- a/media/libaaudio/src/legacy/AudioStreamRecord.cpp
+++ b/media/libaaudio/src/legacy/AudioStreamRecord.cpp
@@ -63,7 +63,9 @@
// TODO Support UNSPECIFIED in AudioRecord. For now, use stereo if unspecified.
int32_t samplesPerFrame = (getSamplesPerFrame() == AAUDIO_UNSPECIFIED)
? 2 : getSamplesPerFrame();
- audio_channel_mask_t channelMask = audio_channel_in_mask_from_count(samplesPerFrame);
+ audio_channel_mask_t channelMask = samplesPerFrame <= 2 ?
+ audio_channel_in_mask_from_count(samplesPerFrame) :
+ audio_channel_mask_for_index_assignment_from_count(samplesPerFrame);
size_t frameCount = (builder.getBufferCapacity() == AAUDIO_UNSPECIFIED) ? 0
: builder.getBufferCapacity();
diff --git a/media/libaaudio/src/legacy/AudioStreamTrack.cpp b/media/libaaudio/src/legacy/AudioStreamTrack.cpp
index d628bf7..094cdd1 100644
--- a/media/libaaudio/src/legacy/AudioStreamTrack.cpp
+++ b/media/libaaudio/src/legacy/AudioStreamTrack.cpp
@@ -66,7 +66,9 @@
// Use stereo if unspecified.
int32_t samplesPerFrame = (getSamplesPerFrame() == AAUDIO_UNSPECIFIED)
? 2 : getSamplesPerFrame();
- audio_channel_mask_t channelMask = audio_channel_out_mask_from_count(samplesPerFrame);
+ audio_channel_mask_t channelMask = samplesPerFrame <= 2 ?
+ audio_channel_out_mask_from_count(samplesPerFrame) :
+ audio_channel_mask_for_index_assignment_from_count(samplesPerFrame);
audio_output_flags_t flags;
aaudio_performance_mode_t perfMode = getPerformanceMode();
diff --git a/media/libstagefright/codecs/amrwb/src/deemphasis_32.cpp b/media/libstagefright/codecs/amrwb/src/deemphasis_32.cpp
index b80555b..c0e4c51 100644
--- a/media/libstagefright/codecs/amrwb/src/deemphasis_32.cpp
+++ b/media/libstagefright/codecs/amrwb/src/deemphasis_32.cpp
@@ -131,7 +131,7 @@
int16 lo, hi;
L_tmp = ((int32)x_hi[0]) << 16;
- L_tmp += ((int32)x_lo[0]) << 4;
+ L_tmp += (((int32)x_lo[0]) << 4) & 0xFFFF;
L_tmp = shl_int32(L_tmp, 3);
L_tmp = fxp_mac_16by16(*mem, mu, L_tmp),
@@ -144,7 +144,7 @@
for (i = 1; i < L - 1; i++)
{
L_tmp = ((int32)hi) << 16;
- L_tmp += ((int32)lo) << 4;
+ L_tmp += (((int32)lo) << 4) & 0xFFFF;
L_tmp = shl_int32(L_tmp, 3);
L_tmp = fxp_mac_16by16(y[i - 1], mu, L_tmp),
L_tmp = shl_int32(L_tmp, 1); /* saturation can occur here */
@@ -153,7 +153,7 @@
hi = x_hi[i+1];
}
L_tmp = ((int32)hi) << 16;
- L_tmp += ((int32)lo) << 4;
+ L_tmp += (((int32)lo) << 4) & 0xFFFF;
L_tmp = shl_int32(L_tmp, 3);
L_tmp = fxp_mac_16by16(y[i - 1], mu, L_tmp),
L_tmp = shl_int32(L_tmp, 1); /* saturation can occur here */
diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index a48b733..7daa929 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -3277,6 +3277,7 @@
Vector< sp<EffectChain> > effectChains;
audio_session_t activeHapticSessionId = AUDIO_SESSION_NONE;
+ std::vector<sp<Track>> activeTracks;
// If the device is AUDIO_DEVICE_OUT_BUS, check for downstream latency.
//
@@ -3563,6 +3564,12 @@
}
}
+ // Acquire a local copy of active tracks with lock (release w/o lock).
+ //
+ // Control methods on the track acquire the ThreadBase lock (e.g. start()
+ // stop(), pause(), etc.), but the threadLoop is entitled to call audio
+ // data / buffer methods on tracks from activeTracks without the ThreadBase lock.
+ activeTracks.insert(activeTracks.end(), mActiveTracks.begin(), mActiveTracks.end());
} // mLock scope ends
if (mBytesRemaining == 0) {
@@ -3577,6 +3584,13 @@
threadLoop_sleepTime();
if (mSleepTimeUs == 0) {
mCurrentWriteLength = mSinkBufferSize;
+
+ // Tally underrun frames as we are inserting 0s here.
+ for (const auto& track : activeTracks) {
+ if (track->mFillingUpStatus == Track::FS_ACTIVE) {
+ track->mAudioTrackServerProxy->tallyUnderrunFrames(mNormalFrameCount);
+ }
+ }
}
}
// Either threadLoop_mix() or threadLoop_sleepTime() should have set
diff --git a/services/audiopolicy/common/managerdefinitions/include/AudioPort.h b/services/audiopolicy/common/managerdefinitions/include/AudioPort.h
index 2d182bd..d906f11 100644
--- a/services/audiopolicy/common/managerdefinitions/include/AudioPort.h
+++ b/services/audiopolicy/common/managerdefinitions/include/AudioPort.h
@@ -112,6 +112,9 @@
static bool isBetterFormatMatch(audio_format_t newFormat,
audio_format_t currentFormat,
audio_format_t targetFormat);
+ static uint32_t formatDistance(audio_format_t format1,
+ audio_format_t format2);
+ static const uint32_t kFormatDistanceMax = 4;
audio_module_handle_t getModuleHandle() const;
uint32_t getModuleVersionMajor() const;
diff --git a/services/audiopolicy/common/managerdefinitions/src/AudioPort.cpp b/services/audiopolicy/common/managerdefinitions/src/AudioPort.cpp
index a66c695..c11490a 100644
--- a/services/audiopolicy/common/managerdefinitions/src/AudioPort.cpp
+++ b/services/audiopolicy/common/managerdefinitions/src/AudioPort.cpp
@@ -282,30 +282,25 @@
return index1 - index2;
}
+uint32_t AudioPort::formatDistance(audio_format_t format1, audio_format_t format2)
+{
+ if (format1 == format2) {
+ return 0;
+ }
+ if (format1 == AUDIO_FORMAT_INVALID || format2 == AUDIO_FORMAT_INVALID) {
+ return kFormatDistanceMax;
+ }
+ int diffBytes = (int)audio_bytes_per_sample(format1) -
+ audio_bytes_per_sample(format2);
+
+ return abs(diffBytes);
+}
+
bool AudioPort::isBetterFormatMatch(audio_format_t newFormat,
audio_format_t currentFormat,
audio_format_t targetFormat)
{
- if (newFormat == currentFormat) {
- return false;
- }
- if (currentFormat == AUDIO_FORMAT_INVALID) {
- return true;
- }
- if (newFormat == targetFormat) {
- return true;
- }
- int currentDiffBytes = (int)audio_bytes_per_sample(targetFormat) -
- audio_bytes_per_sample(currentFormat);
- int newDiffBytes = (int)audio_bytes_per_sample(targetFormat) -
- audio_bytes_per_sample(newFormat);
-
- if (abs(newDiffBytes) < abs(currentDiffBytes)) {
- return true;
- } else if (abs(newDiffBytes) == abs(currentDiffBytes)) {
- return (newDiffBytes >= 0);
- }
- return false;
+ return formatDistance(newFormat, targetFormat) < formatDistance(currentFormat, targetFormat);
}
void AudioPort::pickAudioProfile(uint32_t &samplingRate,
diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index 6f62b90..2dc7cad 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -36,12 +36,12 @@
#define AUDIO_POLICY_BLUETOOTH_LEGACY_HAL_XML_CONFIG_FILE_NAME \
"audio_policy_configuration_bluetooth_legacy_hal.xml"
+#include <algorithm>
#include <inttypes.h>
#include <math.h>
#include <set>
#include <unordered_set>
#include <vector>
-
#include <AudioPolicyManagerInterface.h>
#include <AudioPolicyEngineInstance.h>
#include <cutils/properties.h>
@@ -592,7 +592,7 @@
AUDIO_DEVICE_OUT_TELEPHONY_TX, String8(), AUDIO_FORMAT_DEFAULT);
SortedVector<audio_io_handle_t> outputs =
getOutputsForDevices(DeviceVector(outputDevice), mOutputs);
- audio_io_handle_t output = selectOutput(outputs, AUDIO_OUTPUT_FLAG_NONE, AUDIO_FORMAT_INVALID);
+ const audio_io_handle_t output = selectOutput(outputs);
// request to reuse existing output stream if one is already opened to reach the target device
if (output != AUDIO_IO_HANDLE_NONE) {
sp<AudioOutputDescriptor> outputDesc = mOutputs.valueFor(output);
@@ -883,7 +883,7 @@
// and AudioSystem::getOutputSamplingRate().
SortedVector<audio_io_handle_t> outputs = getOutputsForDevices(devices, mOutputs);
- audio_io_handle_t output = selectOutput(outputs, AUDIO_OUTPUT_FLAG_NONE, AUDIO_FORMAT_INVALID);
+ const audio_io_handle_t output = selectOutput(outputs);
ALOGV("getOutput() stream %d selected devices %s, output %d", stream,
devices.toString().c_str(), output);
@@ -1430,108 +1430,125 @@
audio_channel_mask_t channelMask,
uint32_t samplingRate)
{
+ LOG_ALWAYS_FATAL_IF(!(format == AUDIO_FORMAT_INVALID || audio_is_linear_pcm(format)),
+ "%s called with format %#x", __func__, format);
+
+ // Flags disqualifying an output: the match must happen before calling selectOutput()
+ static const audio_output_flags_t kExcludedFlags = (audio_output_flags_t)
+ (AUDIO_OUTPUT_FLAG_HW_AV_SYNC | AUDIO_OUTPUT_FLAG_MMAP_NOIRQ | AUDIO_OUTPUT_FLAG_DIRECT);
+
+ // Flags expressing a functional request: must be honored in priority over
+ // other criteria
+ static const audio_output_flags_t kFunctionalFlags = (audio_output_flags_t)
+ (AUDIO_OUTPUT_FLAG_VOIP_RX | AUDIO_OUTPUT_FLAG_INCALL_MUSIC |
+ AUDIO_OUTPUT_FLAG_TTS | AUDIO_OUTPUT_FLAG_DIRECT_PCM);
+ // Flags expressing a performance request: have lower priority than serving
+ // requested sampling rate or channel mask
+ static const audio_output_flags_t kPerformanceFlags = (audio_output_flags_t)
+ (AUDIO_OUTPUT_FLAG_FAST | AUDIO_OUTPUT_FLAG_DEEP_BUFFER |
+ AUDIO_OUTPUT_FLAG_RAW | AUDIO_OUTPUT_FLAG_SYNC);
+
+ const audio_output_flags_t functionalFlags =
+ (audio_output_flags_t)(flags & kFunctionalFlags);
+ const audio_output_flags_t performanceFlags =
+ (audio_output_flags_t)(flags & kPerformanceFlags);
+
+ audio_io_handle_t bestOutput = (outputs.size() == 0) ? AUDIO_IO_HANDLE_NONE : outputs[0];
+
// select one output among several that provide a path to a particular device or set of
// devices (the list was previously build by getOutputsForDevices()).
// The priority is as follows:
// 1: the output supporting haptic playback when requesting haptic playback
- // 2: the output with the highest number of requested policy flags
- // 3: the output with the bit depth the closest to the requested one
- // 4: the primary output
- // 5: the first output in the list
+ // 2: the output with the highest number of requested functional flags
+ // 3: the output supporting the exact channel mask
+ // 4: the output with a higher channel count than requested
+ // 5: the output with a higher sampling rate than requested
+ // 6: the output with the highest number of requested performance flags
+ // 7: the output with the bit depth the closest to the requested one
+ // 8: the primary output
+ // 9: the first output in the list
- if (outputs.size() == 0) {
- return AUDIO_IO_HANDLE_NONE;
- }
- if (outputs.size() == 1) {
- return outputs[0];
- }
+ // matching criteria values in priority order for best matching output so far
+ std::vector<uint32_t> bestMatchCriteria(8, 0);
- int maxCommonFlags = 0;
- const size_t hapticChannelCount = audio_channel_count_from_out_mask(
- channelMask & AUDIO_CHANNEL_HAPTIC_ALL);
- audio_io_handle_t outputForFlags = AUDIO_IO_HANDLE_NONE;
- audio_io_handle_t outputForPrimary = AUDIO_IO_HANDLE_NONE;
- audio_io_handle_t outputForFormat = AUDIO_IO_HANDLE_NONE;
- audio_format_t bestFormat = AUDIO_FORMAT_INVALID;
- audio_format_t bestFormatForFlags = AUDIO_FORMAT_INVALID;
-
- // Flags which must be present on both the request and the selected output
- static const audio_output_flags_t kMandatedFlags = (audio_output_flags_t)
- (AUDIO_OUTPUT_FLAG_HW_AV_SYNC | AUDIO_OUTPUT_FLAG_MMAP_NOIRQ);
+ const uint32_t channelCount = audio_channel_count_from_out_mask(channelMask);
+ const uint32_t hapticChannelCount = audio_channel_count_from_out_mask(
+ channelMask & AUDIO_CHANNEL_HAPTIC_ALL);
for (audio_io_handle_t output : outputs) {
sp<SwAudioOutputDescriptor> outputDesc = mOutputs.valueFor(output);
- if (!outputDesc->isDuplicated()) {
- if (outputDesc->mFlags & AUDIO_OUTPUT_FLAG_DIRECT) {
- continue;
- }
- // If haptic channel is specified, use the haptic output if present.
- // When using haptic output, same audio format and sample rate are required.
- if (hapticChannelCount > 0) {
- // If haptic channel is specified, use the first output that
- // support haptic playback.
- if (audio_channel_count_from_out_mask(
- outputDesc->mChannelMask & AUDIO_CHANNEL_HAPTIC_ALL) >= hapticChannelCount
- && format == outputDesc->mFormat
- && samplingRate == outputDesc->mSamplingRate) {
- return output;
- }
- } else {
- // When haptic channel is not specified, skip haptic output.
- if (outputDesc->mChannelMask & AUDIO_CHANNEL_HAPTIC_ALL) {
- continue;
- }
- }
- if ((kMandatedFlags & flags) !=
- (kMandatedFlags & outputDesc->mProfile->getFlags())) {
- continue;
- }
+ // matching criteria values in priority order for current output
+ std::vector<uint32_t> currentMatchCriteria(8, 0);
- // if a valid format is specified, skip output if not compatible
- if (format != AUDIO_FORMAT_INVALID) {
- if (!audio_is_linear_pcm(format)) {
- continue;
- }
- if (AudioPort::isBetterFormatMatch(
- outputDesc->mFormat, bestFormat, format)) {
- outputForFormat = output;
- bestFormat = outputDesc->mFormat;
- }
- }
+ if (outputDesc->isDuplicated()) {
+ continue;
+ }
+ if ((kExcludedFlags & outputDesc->mFlags) != 0) {
+ continue;
+ }
- int commonFlags = popcount(outputDesc->mProfile->getFlags() & flags);
- if (commonFlags >= maxCommonFlags) {
- if (commonFlags == maxCommonFlags) {
- if (format != AUDIO_FORMAT_INVALID
- && AudioPort::isBetterFormatMatch(
- outputDesc->mFormat, bestFormatForFlags, format)) {
- outputForFlags = output;
- bestFormatForFlags = outputDesc->mFormat;
- }
- } else {
- outputForFlags = output;
- maxCommonFlags = commonFlags;
- bestFormatForFlags = outputDesc->mFormat;
- }
- ALOGV("selectOutput() commonFlags for output %d, %04x", output, commonFlags);
+ // If haptic channel is specified, use the haptic output if present.
+ // When using haptic output, same audio format and sample rate are required.
+ const uint32_t outputHapticChannelCount = audio_channel_count_from_out_mask(
+ outputDesc->mChannelMask & AUDIO_CHANNEL_HAPTIC_ALL);
+ if ((hapticChannelCount == 0) != (outputHapticChannelCount == 0)) {
+ continue;
+ }
+ if (outputHapticChannelCount >= hapticChannelCount
+ && format == outputDesc->mFormat
+ && samplingRate == outputDesc->mSamplingRate) {
+ currentMatchCriteria[0] = outputHapticChannelCount;
+ }
+
+ // functional flags match
+ currentMatchCriteria[1] = popcount(outputDesc->mFlags & functionalFlags);
+
+ // channel mask and channel count match
+ uint32_t outputChannelCount = audio_channel_count_from_out_mask(outputDesc->mChannelMask);
+ if (channelMask != AUDIO_CHANNEL_NONE && channelCount > 2 &&
+ channelCount <= outputChannelCount) {
+ if ((audio_channel_mask_get_representation(channelMask) ==
+ audio_channel_mask_get_representation(outputDesc->mChannelMask)) &&
+ ((channelMask & outputDesc->mChannelMask) == channelMask)) {
+ currentMatchCriteria[2] = outputChannelCount;
}
- if (outputDesc->mProfile->getFlags() & AUDIO_OUTPUT_FLAG_PRIMARY) {
- outputForPrimary = output;
- }
+ currentMatchCriteria[3] = outputChannelCount;
+ }
+
+ // sampling rate match
+ if (samplingRate > SAMPLE_RATE_HZ_DEFAULT &&
+ samplingRate <= outputDesc->mSamplingRate) {
+ currentMatchCriteria[4] = outputDesc->mSamplingRate;
+ }
+
+ // performance flags match
+ currentMatchCriteria[5] = popcount(outputDesc->mFlags & performanceFlags);
+
+ // format match
+ if (format != AUDIO_FORMAT_INVALID) {
+ currentMatchCriteria[6] =
+ AudioPort::kFormatDistanceMax -
+ AudioPort::formatDistance(format, outputDesc->mFormat);
+ }
+
+ // primary output match
+ currentMatchCriteria[7] = outputDesc->mFlags & AUDIO_OUTPUT_FLAG_PRIMARY;
+
+ // compare match criteria by priority then value
+ if (std::lexicographical_compare(bestMatchCriteria.begin(), bestMatchCriteria.end(),
+ currentMatchCriteria.begin(), currentMatchCriteria.end())) {
+ bestMatchCriteria = currentMatchCriteria;
+ bestOutput = output;
+
+ std::stringstream result;
+ std::copy(bestMatchCriteria.begin(), bestMatchCriteria.end(),
+ std::ostream_iterator<int>(result, " "));
+ ALOGV("%s new bestOutput %d criteria %s",
+ __func__, bestOutput, result.str().c_str());
}
}
- if (outputForFlags != AUDIO_IO_HANDLE_NONE) {
- return outputForFlags;
- }
- if (outputForFormat != AUDIO_IO_HANDLE_NONE) {
- return outputForFormat;
- }
- if (outputForPrimary != AUDIO_IO_HANDLE_NONE) {
- return outputForPrimary;
- }
-
- return outputs[0];
+ return bestOutput;
}
status_t AudioPolicyManager::startOutput(audio_port_handle_t portId)
@@ -3474,7 +3491,7 @@
getOutputsForDevices(DeviceVector(sinkDevice), mOutputs);
// if the sink device is reachable via an opened output stream, request to go via
// this output stream by adding a second source to the patch description
- audio_io_handle_t output = selectOutput(outputs);
+ const audio_io_handle_t output = selectOutput(outputs);
if (output != AUDIO_IO_HANDLE_NONE) {
sp<AudioOutputDescriptor> outputDesc = mOutputs.valueFor(output);
if (outputDesc->isDuplicated()) {
diff --git a/services/camera/libcameraservice/device3/Camera3Device.cpp b/services/camera/libcameraservice/device3/Camera3Device.cpp
index 415b2d8..f4abba4 100644
--- a/services/camera/libcameraservice/device3/Camera3Device.cpp
+++ b/services/camera/libcameraservice/device3/Camera3Device.cpp
@@ -2522,6 +2522,9 @@
CLOGE("Stream %d is unknown", streamId);
return BAD_VALUE;
}
+
+ // isConsumerConfigurationDeferred will be off after setConsumers
+ bool isDeferred = stream->isConsumerConfigurationDeferred();
status_t res = stream->setConsumers(consumers);
if (res != OK) {
CLOGE("Stream %d set consumer failed (error %d %s) ", streamId, res, strerror(-res));
@@ -2537,7 +2540,7 @@
surfaceIds->push_back(id);
}
- if (stream->isConsumerConfigurationDeferred()) {
+ if (isDeferred) {
if (!stream->isConfiguring()) {
CLOGE("Stream %d was already fully configured.", streamId);
return INVALID_OPERATION;
@@ -2612,7 +2615,6 @@
sp<Camera3Device::CaptureRequest> Camera3Device::createCaptureRequest(
const PhysicalCameraSettingsList &request, const SurfaceMap &surfaceMap) {
ATRACE_CALL();
- status_t res;
sp<CaptureRequest> newRequest = new CaptureRequest;
newRequest->mSettingsList = request;
@@ -2626,16 +2628,11 @@
inputStreams.data.u8[0]);
return NULL;
}
- // Lazy completion of stream configuration (allocation/registration)
- // on first use
+
if (mInputStream->isConfiguring()) {
- res = mInputStream->finishConfiguration();
- if (res != OK) {
- SET_ERR_L("Unable to finish configuring input stream %d:"
- " %s (%d)",
- mInputStream->getId(), strerror(-res), res);
- return NULL;
- }
+ SET_ERR_L("%s: input stream %d is not configured!",
+ __FUNCTION__, mInputStream->getId());
+ return NULL;
}
// Check if stream prepare is blocking requests.
if (mInputStream->isBlockedByPrepare()) {
@@ -2675,15 +2672,9 @@
newRequest->mOutputSurfaces[streams.data.i32[i]] = surfaces;
}
- // Lazy completion of stream configuration (allocation/registration)
- // on first use
if (stream->isConfiguring()) {
- res = stream->finishConfiguration();
- if (res != OK) {
- SET_ERR_L("Unable to finish configuring stream %d: %s (%d)",
- stream->getId(), strerror(-res), res);
- return NULL;
- }
+ SET_ERR_L("%s: stream %d is not configured!", __FUNCTION__, stream->getId());
+ return NULL;
}
// Check if stream prepare is blocking requests.
if (stream->isBlockedByPrepare()) {
@@ -2908,7 +2899,8 @@
// faster
if (mInputStream != NULL && mInputStream->isConfiguring()) {
- res = mInputStream->finishConfiguration();
+ bool streamReConfigured = false;
+ res = mInputStream->finishConfiguration(&streamReConfigured);
if (res != OK) {
CLOGE("Can't finish configuring input stream %d: %s (%d)",
mInputStream->getId(), strerror(-res), res);
@@ -2918,12 +2910,16 @@
}
return BAD_VALUE;
}
+ if (streamReConfigured) {
+ mInterface->onStreamReConfigured(mInputStream->getId());
+ }
}
for (size_t i = 0; i < mOutputStreams.size(); i++) {
sp<Camera3OutputStreamInterface> outputStream = mOutputStreams[i];
if (outputStream->isConfiguring() && !outputStream->isConsumerConfigurationDeferred()) {
- res = outputStream->finishConfiguration();
+ bool streamReConfigured = false;
+ res = outputStream->finishConfiguration(&streamReConfigured);
if (res != OK) {
CLOGE("Can't finish configuring output stream %d: %s (%d)",
outputStream->getId(), strerror(-res), res);
@@ -2933,6 +2929,9 @@
}
return BAD_VALUE;
}
+ if (streamReConfigured) {
+ mInterface->onStreamReConfigured(outputStream->getId());
+ }
}
}
@@ -4780,7 +4779,7 @@
__FUNCTION__, handle, streamId);
return;
} else {
- bufferId = it->second;
+ bufferId = it->second;
bIdMap.erase(it);
ALOGV("%s: stream %d now have %zu buffer caches after removing buf %p",
__FUNCTION__, streamId, bIdMap.size(), handle);
@@ -4788,6 +4787,22 @@
mFreedBuffers.push_back(std::make_pair(streamId, bufferId));
}
+void Camera3Device::HalInterface::onStreamReConfigured(int streamId) {
+ std::lock_guard<std::mutex> lock(mBufferIdMapLock);
+ auto mapIt = mBufferIdMaps.find(streamId);
+ if (mapIt == mBufferIdMaps.end()) {
+ ALOGE("%s: streamId %d not found!", __FUNCTION__, streamId);
+ return;
+ }
+
+ BufferIdMap& bIdMap = mapIt->second;
+ for (const auto& it : bIdMap) {
+ uint64_t bufferId = it.second;
+ mFreedBuffers.push_back(std::make_pair(streamId, bufferId));
+ }
+ bIdMap.clear();
+}
+
/**
* RequestThread inner class methods
*/
diff --git a/services/camera/libcameraservice/device3/Camera3Device.h b/services/camera/libcameraservice/device3/Camera3Device.h
index f8245df..23df3c7 100644
--- a/services/camera/libcameraservice/device3/Camera3Device.h
+++ b/services/camera/libcameraservice/device3/Camera3Device.h
@@ -336,6 +336,8 @@
// Get a vector of bufferId of currently inflight buffers
void getInflightRequestBufferKeys(std::vector<uint64_t>* out);
+ void onStreamReConfigured(int streamId);
+
static const uint64_t BUFFER_ID_NO_BUFFER = 0;
private:
// Always valid
diff --git a/services/camera/libcameraservice/device3/Camera3Stream.cpp b/services/camera/libcameraservice/device3/Camera3Stream.cpp
index 12ff130..d73a2f9 100644
--- a/services/camera/libcameraservice/device3/Camera3Stream.cpp
+++ b/services/camera/libcameraservice/device3/Camera3Stream.cpp
@@ -287,8 +287,11 @@
return (mState == STATE_IN_CONFIG) || (mState == STATE_IN_RECONFIG);
}
-status_t Camera3Stream::finishConfiguration() {
+status_t Camera3Stream::finishConfiguration(/*out*/bool* streamReconfigured) {
ATRACE_CALL();
+ if (streamReconfigured != nullptr) {
+ *streamReconfigured = false;
+ }
Mutex::Autolock l(mLock);
switch (mState) {
case STATE_ERROR:
@@ -313,7 +316,7 @@
// Register for idle tracking
sp<StatusTracker> statusTracker = mStatusTracker.promote();
- if (statusTracker != 0) {
+ if (statusTracker != 0 && mStatusId == StatusTracker::NO_STATUS_ID) {
mStatusId = statusTracker->addComponent();
}
@@ -332,6 +335,7 @@
mPrepareBlockRequest = true;
mStreamUnpreparable = false;
+ bool reconfiguring = (mState == STATE_IN_RECONFIG);
status_t res;
res = configureQueueLocked();
// configureQueueLocked could return error in case of abandoned surface.
@@ -348,6 +352,9 @@
return res;
}
+ if (reconfiguring && streamReconfigured != nullptr) {
+ *streamReconfigured = true;
+ }
mState = STATE_CONFIGURED;
return res;
diff --git a/services/camera/libcameraservice/device3/Camera3Stream.h b/services/camera/libcameraservice/device3/Camera3Stream.h
index 3d21029..c916fe8 100644
--- a/services/camera/libcameraservice/device3/Camera3Stream.h
+++ b/services/camera/libcameraservice/device3/Camera3Stream.h
@@ -197,6 +197,8 @@
* after this call, but can still be read until the destruction of the
* stream.
*
+ * streamReconfigured: set to true when a stream is being reconfigured.
+ *
* Returns:
* OK on a successful configuration
* NO_INIT in case of a serious error from the HAL device
@@ -204,7 +206,7 @@
* INVALID_OPERATION in case connecting to the consumer failed or consumer
* doesn't exist yet.
*/
- status_t finishConfiguration();
+ status_t finishConfiguration(/*out*/bool* streamReconfigured = nullptr);
/**
* Cancels the stream configuration process. This returns the stream to the
diff --git a/services/camera/libcameraservice/device3/Camera3StreamInterface.h b/services/camera/libcameraservice/device3/Camera3StreamInterface.h
index 5cd11b7..73f501a 100644
--- a/services/camera/libcameraservice/device3/Camera3StreamInterface.h
+++ b/services/camera/libcameraservice/device3/Camera3StreamInterface.h
@@ -130,13 +130,15 @@
* modified after this call, but can still be read until the destruction of
* the stream.
*
+ * streamReconfigured: set to true when a stream is being reconfigured.
+ *
* Returns:
* OK on a successful configuration
* NO_INIT in case of a serious error from the HAL device
* NO_MEMORY in case of an error registering buffers
* INVALID_OPERATION in case connecting to the consumer failed
*/
- virtual status_t finishConfiguration() = 0;
+ virtual status_t finishConfiguration(/*out*/bool* streamReconfigured = nullptr) = 0;
/**
* Cancels the stream configuration process. This returns the stream to the