Merge remote-tracking branch 'upstream/lineage-22.2' into HEAD
diff --git a/media/codec2/sfplugin/CCodecBufferChannel.cpp b/media/codec2/sfplugin/CCodecBufferChannel.cpp
index 5f18b48..834926e 100644
--- a/media/codec2/sfplugin/CCodecBufferChannel.cpp
+++ b/media/codec2/sfplugin/CCodecBufferChannel.cpp
@@ -345,7 +345,7 @@
std::atomic_store(&mComponent, component);
mComponentName = component->getName() + StringPrintf("#%d", int(uintptr_t(component.get()) % 997));
mName = mComponentName.c_str();
- std::regex pattern{"c2\\.qti\\..*\\.decoder.*"};
+ std::regex pattern{"c2\\.(mtk|qti)\\..*\\.decoder.*"};
mIsHWDecoder = std::regex_match(mComponentName, pattern);
}
diff --git a/services/camera/libcameraservice/utils/SessionConfigurationUtils.cpp b/services/camera/libcameraservice/utils/SessionConfigurationUtils.cpp
index a3ea0d8..9be5e2d 100644
--- a/services/camera/libcameraservice/utils/SessionConfigurationUtils.cpp
+++ b/services/camera/libcameraservice/utils/SessionConfigurationUtils.cpp
@@ -236,7 +236,8 @@
// requirement. AIDE2 is vendor enhanced feature which requires special resolutions and
// those are not populated in static capabilities.
if (isPriviledgedClient == true &&
- (format == HAL_PIXEL_FORMAT_YCbCr_420_888 || format == HAL_PIXEL_FORMAT_BLOB)) {
+ (format == HAL_PIXEL_FORMAT_YCbCr_420_888 || format == HAL_PIXEL_FORMAT_BLOB ||
+ format == HAL_PIXEL_FORMAT_Y8)) {
ALOGI("Bypass roundBufferDimensionNearest for privilegedClient YUV streams "
"width %d height %d for format %d", width, height, format);