AidlUtils: update AUGMENT_LOG to support variable arguments
- move logging macros to ConversionHelperAidl
- replace LOG_ENTRY with AUGMENT_LOG
Flag: EXEMPT bugfix
Bug: 356310696
Test: atest CoreAudioHalAidlTest
Change-Id: I3f217913679f43a9db5cde032402c94e7c252fec
diff --git a/media/libaudiohal/impl/StreamHalAidl.cpp b/media/libaudiohal/impl/StreamHalAidl.cpp
index 8a15e7a..01ebe1b 100644
--- a/media/libaudiohal/impl/StreamHalAidl.cpp
+++ b/media/libaudiohal/impl/StreamHalAidl.cpp
@@ -89,7 +89,7 @@
mContext.getBufferDurationMs(mConfig.sample_rate))
* NANOS_PER_MILLISECOND)
{
- LOG_ENTRY();
+ AUGMENT_LOG(D);
{
std::lock_guard l(mLock);
mLastReply.latencyMs = nominalLatency;
@@ -104,7 +104,7 @@
}
StreamHalAidl::~StreamHalAidl() {
- LOG_ENTRY();
+ AUGMENT_LOG(D);
if (mStream != nullptr) {
ndk::ScopedAStatus status = mStream->close();
AUGMENT_LOG_IF(E, !status.isOk(), "status %s", status.getDescription().c_str());
@@ -112,7 +112,7 @@
}
status_t StreamHalAidl::getBufferSize(size_t *size) {
- LOG_ENTRY();
+ AUGMENT_LOG(D);
if (size == nullptr) {
return BAD_VALUE;
}
@@ -126,7 +126,7 @@
}
status_t StreamHalAidl::getAudioProperties(audio_config_base_t *configBase) {
- LOG_ENTRY();
+ AUGMENT_LOG(D);
if (configBase == nullptr) {
return BAD_VALUE;
}
@@ -136,7 +136,7 @@
}
status_t StreamHalAidl::setParameters(const String8& kvPairs) {
- LOG_ENTRY_V();
+ AUGMENT_LOG(V);
TIME_CHECK();
if (!mStream) return NO_INIT;
AudioParameter parameters(kvPairs);
@@ -151,7 +151,7 @@
}
status_t StreamHalAidl::getParameters(const String8& keys __unused, String8 *values) {
- LOG_ENTRY_V();
+ AUGMENT_LOG(V);
TIME_CHECK();
if (!mStream) return NO_INIT;
if (values == nullptr) {
@@ -163,7 +163,7 @@
}
status_t StreamHalAidl::getFrameSize(size_t *size) {
- LOG_ENTRY();
+ AUGMENT_LOG(D);
if (size == nullptr) {
return BAD_VALUE;
}
@@ -175,7 +175,7 @@
}
status_t StreamHalAidl::addEffect(sp<EffectHalInterface> effect) {
- LOG_ENTRY();
+ AUGMENT_LOG(D);
TIME_CHECK();
if (!mStream) return NO_INIT;
if (effect == nullptr) {
@@ -186,7 +186,7 @@
}
status_t StreamHalAidl::removeEffect(sp<EffectHalInterface> effect) {
- LOG_ENTRY();
+ AUGMENT_LOG(D);
TIME_CHECK();
if (!mStream) return NO_INIT;
if (effect == nullptr) {
@@ -197,7 +197,7 @@
}
status_t StreamHalAidl::standby() {
- LOG_ENTRY();
+ AUGMENT_LOG(D);
TIME_CHECK();
if (!mStream) return NO_INIT;
const auto state = getState();
@@ -245,7 +245,7 @@
}
status_t StreamHalAidl::dump(int fd, const Vector<String16>& args) {
- LOG_ENTRY();
+ AUGMENT_LOG(D);
TIME_CHECK();
if (!mStream) return NO_INIT;
status_t status = mStream->dump(fd, Args(args).args(), args.size());
@@ -254,7 +254,7 @@
}
status_t StreamHalAidl::start() {
- LOG_ENTRY();
+ AUGMENT_LOG(D);
TIME_CHECK();
if (!mStream) return NO_INIT;
if (!mContext.isMmapped()) {
@@ -300,7 +300,7 @@
}
status_t StreamHalAidl::stop() {
- LOG_ENTRY();
+ AUGMENT_LOG(D);
TIME_CHECK();
if (!mStream) return NO_INIT;
if (!mContext.isMmapped()) {
@@ -325,7 +325,7 @@
}
status_t StreamHalAidl::getLatency(uint32_t *latency) {
- LOG_ENTRY_V();
+ AUGMENT_LOG(V);
if (!mStream) return NO_INIT;
StreamDescriptor::Reply reply;
RETURN_STATUS_IF_ERROR(updateCountersIfNeeded(&reply));
@@ -338,7 +338,7 @@
status_t StreamHalAidl::getObservablePosition(int64_t* frames, int64_t* timestamp,
StatePositions* statePositions) {
- LOG_ENTRY_V();
+ AUGMENT_LOG(V);
if (!mStream) return NO_INIT;
StreamDescriptor::Reply reply;
RETURN_STATUS_IF_ERROR(updateCountersIfNeeded(&reply, statePositions));
@@ -348,7 +348,7 @@
}
status_t StreamHalAidl::getHardwarePosition(int64_t *frames, int64_t *timestamp) {
- LOG_ENTRY_V();
+ AUGMENT_LOG(V);
if (!mStream) return NO_INIT;
StreamDescriptor::Reply reply;
RETURN_STATUS_IF_ERROR(updateCountersIfNeeded(&reply));
@@ -358,7 +358,7 @@
}
status_t StreamHalAidl::getXruns(int32_t *frames) {
- LOG_ENTRY_V();
+ AUGMENT_LOG(V);
if (!mStream) return NO_INIT;
StreamDescriptor::Reply reply;
RETURN_STATUS_IF_ERROR(updateCountersIfNeeded(&reply));
@@ -367,7 +367,7 @@
}
status_t StreamHalAidl::transfer(void *buffer, size_t bytes, size_t *transferred) {
- LOG_ENTRY_V();
+ AUGMENT_LOG(V);
// TIME_CHECK(); // TODO(b/243839867) reenable only when optimized.
if (!mStream || mContext.getDataMQ() == nullptr) return NO_INIT;
mWorkerTid.store(gettid(), std::memory_order_release);
@@ -418,7 +418,7 @@
}
status_t StreamHalAidl::pause(StreamDescriptor::Reply* reply) {
- LOG_ENTRY();
+ AUGMENT_LOG(D);
TIME_CHECK();
if (!mStream) return NO_INIT;
@@ -434,7 +434,7 @@
}
status_t StreamHalAidl::resume(StreamDescriptor::Reply* reply) {
- LOG_ENTRY();
+ AUGMENT_LOG(D);
TIME_CHECK();
if (!mStream) return NO_INIT;
if (mIsInput) {
@@ -471,7 +471,7 @@
}
status_t StreamHalAidl::drain(bool earlyNotify, StreamDescriptor::Reply* reply) {
- LOG_ENTRY();
+ AUGMENT_LOG(D);
TIME_CHECK();
if (!mStream) return NO_INIT;
return sendCommand(makeHalCommand<HalCommand::Tag::drain>(
@@ -482,7 +482,7 @@
}
status_t StreamHalAidl::flush(StreamDescriptor::Reply* reply) {
- LOG_ENTRY();
+ AUGMENT_LOG(D);
TIME_CHECK();
if (!mStream) return NO_INIT;
@@ -501,7 +501,7 @@
}
status_t StreamHalAidl::exit() {
- LOG_ENTRY();
+ AUGMENT_LOG(D);
TIME_CHECK();
if (!mStream) return NO_INIT;
return statusTFromBinderStatus(mStream->prepareToClose());
@@ -541,7 +541,7 @@
status_t StreamHalAidl::createMmapBuffer(int32_t minSizeFrames __unused,
struct audio_mmap_buffer_info *info) {
- LOG_ENTRY();
+ AUGMENT_LOG(D);
TIME_CHECK();
if (!mStream) return NO_INIT;
if (!mContext.isMmapped()) {
@@ -779,7 +779,7 @@
}
status_t StreamOutHalAidl::setCallback(wp<StreamOutHalInterfaceCallback> callback) {
- LOG_ENTRY();
+ AUGMENT_LOG(D);
TIME_CHECK();
if (!mStream) return NO_INIT;
if (!mContext.isAsynchronous()) {
@@ -855,7 +855,7 @@
}
status_t StreamOutHalAidl::presentationComplete() {
- LOG_ENTRY();
+ AUGMENT_LOG(D);
return OK;
}