Merge "Remove packagemanager_aidl from export_shared_lib_headers"
diff --git a/camera/OWNERS b/camera/OWNERS
index 47d1d19..385c163 100644
--- a/camera/OWNERS
+++ b/camera/OWNERS
@@ -1,8 +1,7 @@
-epeev@google.com
+# Bug component: 41727
etalvala@google.com
+arakesh@google.com
+epeev@google.com
jchowdhary@google.com
shuzhenwang@google.com
ruchamk@google.com
-# backup owner
-cychen@google.com
-zhijunhe@google.com
diff --git a/media/codec2/hidl/1.0/vts/functional/audio/VtsHalMediaC2V1_0TargetAudioDecTest.cpp b/media/codec2/hidl/1.0/vts/functional/audio/VtsHalMediaC2V1_0TargetAudioDecTest.cpp
index 9e3a823..d47ef67 100644
--- a/media/codec2/hidl/1.0/vts/functional/audio/VtsHalMediaC2V1_0TargetAudioDecTest.cpp
+++ b/media/codec2/hidl/1.0/vts/functional/audio/VtsHalMediaC2V1_0TargetAudioDecTest.cpp
@@ -465,6 +465,11 @@
if (mMime.find("raw") != std::string::npos) {
bitStreamInfo[0] = 8000;
bitStreamInfo[1] = 1;
+ } else if ((mMime.find("g711-alaw") != std::string::npos) ||
+ (mMime.find("g711-mlaw") != std::string::npos)) {
+ // g711 test data is all 1-channel and has no embedded config info.
+ bitStreamInfo[0] = 8000;
+ bitStreamInfo[1] = 1;
} else {
ASSERT_NO_FATAL_FAILURE(getInputChannelInfo(mComponent, mMime, bitStreamInfo));
}
diff --git a/media/codec2/sfplugin/CCodecBuffers.cpp b/media/codec2/sfplugin/CCodecBuffers.cpp
index e12b209..d57eb0c 100644
--- a/media/codec2/sfplugin/CCodecBuffers.cpp
+++ b/media/codec2/sfplugin/CCodecBuffers.cpp
@@ -233,7 +233,7 @@
if (!srcBuffer) {
return false;
}
- if (!dst) {
+ if (!*dst) {
*dst = new Codec2Buffer(
mFormat,
new ABuffer(mDataConverter->targetSize(srcBuffer->size())));
diff --git a/media/codec2/sfplugin/CCodecBuffers.h b/media/codec2/sfplugin/CCodecBuffers.h
index 7f3a655..c8e9930 100644
--- a/media/codec2/sfplugin/CCodecBuffers.h
+++ b/media/codec2/sfplugin/CCodecBuffers.h
@@ -385,7 +385,7 @@
void submit(const sp<MediaCodecBuffer> &buffer);
/**
- * Apply DataConverter from |src| to |*dst| if needed. If |dst| is nullptr,
+ * Apply DataConverter from |src| to |*dst| if needed. If |*dst| is nullptr,
* a new buffer is allocated.
*
* Returns true if conversion was needed and executed; false otherwise.