crdroidandroid · pbzin · Mar 5, 2025 · May 4, 2025 · Jan 30, 2023 · Apr 29, 2014
diff --git a/camera/CameraParameters.cpp b/camera/CameraParameters.cpp
@@ -238,6 +238,9 @@ void CameraParameters::unflatten(const String8 &params)
 
 void CameraParameters::set(const char *key, const char *value)
 {
+    if (key == NULL || value == NULL)
+        return;
+
     // XXX i think i can do this with strspn()
     if (strchr(key, '=') || strchr(key, ';')) {
         //XXX ALOGE("Key \"%s\"contains invalid character (= or ;)", key);

diff --git a/camera/CameraSessionStats.cpp b/camera/CameraSessionStats.cpp
@@ -260,6 +260,10 @@ const int CameraSessionStats::CAMERA_STATE_ACTIVE = 1;
 const int CameraSessionStats::CAMERA_STATE_IDLE = 2;
 const int CameraSessionStats::CAMERA_STATE_CLOSED = 3;
 
+const int CameraSessionStats::CAMERA_STATE_EXCEPTION = 4;
+const int CameraSessionStats::CAMERA_STATE_SESSION_CONFIGURED = 5;
+const int CameraSessionStats::CAMERA_STATE_FIRST_FRAME_ARRIVED = 6;
+
 const int CameraSessionStats::CAMERA_FACING_BACK = 0;
 const int CameraSessionStats::CAMERA_FACING_FRONT = 1;
 const int CameraSessionStats::CAMERA_FACING_EXTERNAL = 2;

diff --git a/camera/ICameraClient.cpp b/camera/ICameraClient.cpp
@@ -51,7 +51,12 @@ class BpCameraClient: public BpInterface<ICameraClient>
         data.writeInterfaceToken(ICameraClient::getInterfaceDescriptor());
         data.writeInt32(msgType);
         data.writeInt32(ext1);
-        data.writeInt32(ext2);
+        if ((msgType == CAMERA_MSG_PREVIEW_FRAME) && (ext1 == CAMERA_FRAME_DATA_FD)) {
+            ALOGD("notifyCallback: CAMERA_MSG_PREVIEW_FRAME fd = %d", ext2);
+            data.writeFileDescriptor(ext2);
+        } else {
+            data.writeInt32(ext2);
+        }
         remote()->transact(NOTIFY_CALLBACK, data, &reply, IBinder::FLAG_ONEWAY);
     }
 
@@ -129,8 +134,14 @@ status_t BnCameraClient::onTransact(
             ALOGV("NOTIFY_CALLBACK");
             CHECK_INTERFACE(ICameraClient, data, reply);
             int32_t msgType = data.readInt32();
-            int32_t ext1 = data.readInt32();
-            int32_t ext2 = data.readInt32();
+            int32_t ext1    = data.readInt32();
+            int32_t ext2    = 0;
+            if ((msgType == CAMERA_MSG_PREVIEW_FRAME) && (ext1 == CAMERA_FRAME_DATA_FD)) {
+                ext2 = data.readFileDescriptor();
+                ALOGD("onTransact: CAMERA_MSG_PREVIEW_FRAME fd = %d", ext2);
+            } else {
+                ext2 = data.readInt32();
+            }
             notifyCallback(msgType, ext1, ext2);
             return NO_ERROR;
         } break;

diff --git a/camera/cameraserver/Android.bp b/camera/cameraserver/Android.bp
@@ -52,17 +52,31 @@ cc_binary {
         "android.hardware.camera.device@1.0",
         "android.hardware.camera.device@3.2",
         "android.hardware.camera.device@3.4",
-    ],
+    ] + select(soong_config_variable("camera", "needs_client_info_lib"), {
+        true: ["//hardware/oneplus:vendor.oneplus.hardware.camera@1.0"],
+        false: [],
+        default: [],
+    }) + select(soong_config_variable("camera", "needs_client_info_lib_oplus"), {
+        true: ["vendor.oplus.hardware.cameraMDM@2.0"],
+        false: [],
+        default: [],
+    }),
+
     static_libs: [
         "libcameraservice",
     ],
+
     compile_multilib: "first",
+
     cflags: [
         "-Wall",
         "-Wextra",
         "-Werror",
         "-Wno-unused-parameter",
-    ],
+    ] + select(soong_config_variable("camera", "package_name"), {
+        any @ flag_val: ["-DCAMERA_PACKAGE_NAME=\"" + flag_val + "\""],
+        default: [],
+    }),
 
     init_rc: ["cameraserver.rc"],
 

diff --git a/camera/include/camera/CameraSessionStats.h b/camera/include/camera/CameraSessionStats.h
@@ -109,6 +109,9 @@ class CameraSessionStats : public android::Parcelable {
     static const int CAMERA_STATE_ACTIVE;
     static const int CAMERA_STATE_IDLE;
     static const int CAMERA_STATE_CLOSED;
+    static const int CAMERA_STATE_EXCEPTION;
+    static const int CAMERA_STATE_SESSION_CONFIGURED;
+    static const int CAMERA_STATE_FIRST_FRAME_ARRIVED;
 
     /**
      * Values for notifyCameraState facing

diff --git a/include/media/AppVolume.h b/include/media/AppVolume.h
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2022 Project Kaleidoscope
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef APP_VOLUME_H
+#define APP_VOLUME_H
+
+#include <android/media/AppVolumeData.h>
+#include <utils/String8.h>
+#include <binder/Parcel.h>
+#include <binder/Parcelable.h>
+#include <media/AidlConversionUtil.h>
+
+namespace android {
+namespace media {
+    class AppVolume : public Parcelable {
+    public:
+        String8 packageName;
+        bool muted;
+        float volume;
+        bool active;
+
+        bool operator <(const AppVolume &obj) const {
+            if (active != obj.active) return active < obj.active;
+            return packageName < obj.packageName;
+        }
+
+        virtual status_t writeToParcel(Parcel* parcel) const {
+            AppVolumeData parcelable;
+            return writeToParcelable(&parcelable)
+                ?: parcelable.writeToParcel(parcel);
+        }
+
+        virtual status_t writeToParcelable(AppVolumeData* parcelable) const {
+            parcelable->packageName = packageName.c_str();
+            parcelable->muted = muted;
+            parcelable->volume = volume;
+            parcelable->active = active;
+            return OK;
+        }
+
+        virtual status_t readFromParcel(const Parcel* parcel) {
+            AppVolumeData data;
+            return data.readFromParcel(parcel)
+                ?: readFromParcelable(data);
+        }
+
+        virtual status_t readFromParcelable(const AppVolumeData& parcelable) {
+            packageName = parcelable.packageName.c_str();
+            muted = parcelable.muted;
+            volume = parcelable.volume;
+            active = parcelable.active;
+            return OK;
+        }
+    };
+
+    inline ConversionResult<AppVolume>
+    aidl2legacy_AppVolume(const AppVolumeData& aidl) {
+        AppVolume legacy;
+        RETURN_IF_ERROR(legacy.readFromParcelable(aidl));
+        return legacy;
+    }
+
+    inline ConversionResult<AppVolumeData>
+    legacy2aidl_AppVolume(const AppVolume& legacy) {
+        AppVolumeData aidl;
+        RETURN_IF_ERROR(legacy.writeToParcelable(&aidl));
+        return aidl;
+    }
+} // namespace media
+};  // namespace android
+
+#endif // APP_VOLUME_H
diff --git a/media/aidl/Android.bp b/media/aidl/Android.bp
@@ -43,6 +43,7 @@ aidl_interface {
     double_loadable: true,
     local_include_dir: ".",
     srcs: [
+        "android/media/AppVolumeData.aidl",
         "android/media/IAudioManagerNative.aidl",
         "android/media/InterpolatorConfig.aidl",
         "android/media/InterpolatorType.aidl",

diff --git a/media/aidl/android/media/AppVolumeData.aidl b/media/aidl/android/media/AppVolumeData.aidl
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2022 Project Kaleidoscope
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.media;
+
+/**
+ * {@hide}
+ */
+parcelable AppVolumeData {
+    @utf8InCpp String packageName;
+    int muted;
+    float volume;
+    int active;
+}
diff --git a/media/codec2/components/aom/Android.bp b/media/codec2/components/aom/Android.bp
@@ -12,7 +12,6 @@ cc_library {
     defaults: [
         "libcodec2_soft-defaults",
         "libcodec2_soft_sanitize_all-defaults",
-        "libcodec2_soft_sanitize_cfi-defaults",
     ],
 
     // coordinated with frameworks/av/media/codec2/components/gav1/Android.bp
@@ -23,14 +22,17 @@ cc_library {
 
     srcs: ["C2SoftAomDec.cpp"],
     static_libs: ["libaom"],
+
+    sanitize: {
+        cfi: false,
+    },
 }
 
 cc_library {
     name: "libcodec2_soft_av1enc",
     defaults: [
         "libcodec2_soft-defaults",
         "libcodec2_soft_sanitize_all-defaults",
-        "libcodec2_soft_sanitize_cfi-defaults",
     ],
 
     static_libs: ["libaom"],
@@ -44,4 +46,7 @@ cc_library {
         "com.android.media.swcodec",
     ],
 
+    sanitize: {
+        cfi: false,
+    },
 }
diff --git a/media/codec2/hal/aidl/ComponentStore.cpp b/media/codec2/hal/aidl/ComponentStore.cpp
@@ -156,13 +156,6 @@ ComponentStore::ComponentStore(const std::shared_ptr<C2ComponentStore>& store)
         mParamReflectors.push_back(paramReflector);
     }
 #endif
-    // MultiAccessUnit reflector helper is allocated once per store.
-    // All components in this store can reuse this reflector helper.
-    if (MultiAccessUnitHelper::isEnabledOnPlatform()) {
-        std::shared_ptr<C2ReflectorHelper> helper = std::make_shared<C2ReflectorHelper>();
-        mParamReflectors.push_back(helper);
-        mMultiAccessUnitReflector = helper;
-    }
 
     // Retrieve supported parameters from store
     using namespace std::placeholders;
@@ -250,9 +243,11 @@ std::shared_ptr<MultiAccessUnitInterface> ComponentStore::tryCreateMultiAccessUn
                 // param reflectors. Currently filters work on video domain only,
                 // and the MultiAccessUnitHelper is only enabled on audio domain;
                 // thus we pass the component's param reflector, which is mParamReflectors[0].
+                std::shared_ptr<C2ReflectorHelper> multiAccessReflector(new C2ReflectorHelper());
                 multiAccessUnitIntf = std::make_shared<MultiAccessUnitInterface>(
                         c2interface,
-                        mMultiAccessUnitReflector);
+                        multiAccessReflector);
+                mParamReflectors.push_back(multiAccessReflector);
             }
         }
     }

diff --git a/media/codec2/hal/aidl/include/codec2/aidl/ComponentStore.h b/media/codec2/hal/aidl/include/codec2/aidl/ComponentStore.h
@@ -127,9 +127,6 @@ struct ComponentStore : public BnComponentStore {
     std::shared_ptr<C2ComponentStore> mStore;
     std::vector<std::shared_ptr<C2ParamReflector>> mParamReflectors;
 
-    // Reflector helper for MultiAccessUnitHelper
-    std::shared_ptr<C2ReflectorHelper> mMultiAccessUnitReflector;
-
     std::map<C2Param::CoreIndex, std::shared_ptr<C2StructDescriptor>> mStructDescriptors;
     std::set<C2Param::CoreIndex> mUnsupportedStructDescriptors;
     std::set<C2String> mLoadedInterfaces;

diff --git a/media/codec2/hal/hidl/1.0/utils/ComponentStore.cpp b/media/codec2/hal/hidl/1.0/utils/ComponentStore.cpp
@@ -146,14 +146,6 @@ ComponentStore::ComponentStore(const std::shared_ptr<C2ComponentStore>& store)
     }
 #endif
 
-    // MultiAccessUnit reflector helper is allocated once per store.
-    // All components in this store can reuse this reflector helper.
-    if (MultiAccessUnitHelper::isEnabledOnPlatform()) {
-        std::shared_ptr<C2ReflectorHelper> helper = std::make_shared<C2ReflectorHelper>();
-        mParamReflectors.push_back(helper);
-        mMultiAccessUnitReflector = helper;
-    }
-
     // Retrieve supported parameters from store
     using namespace std::placeholders;
     mInit = mConfigurable->init(mParameterCache);
@@ -236,9 +228,12 @@ std::shared_ptr<MultiAccessUnitInterface> ComponentStore::tryCreateMultiAccessUn
                 }
             }
             if (!isComponentSupportsLargeAudioFrame) {
+                std::shared_ptr<C2ReflectorHelper> multiAccessReflector(new C2ReflectorHelper());
                 multiAccessUnitIntf = std::make_shared<MultiAccessUnitInterface>(
                         c2interface,
-                        mMultiAccessUnitReflector);
+                        multiAccessReflector);
+                mParamReflectors.push_back(multiAccessReflector);
+
             }
         }
     }

diff --git a/media/codec2/hal/hidl/1.0/utils/include/codec2/hidl/1.0/ComponentStore.h b/media/codec2/hal/hidl/1.0/utils/include/codec2/hidl/1.0/ComponentStore.h
@@ -131,9 +131,6 @@ struct ComponentStore : public IComponentStore {
     std::shared_ptr<C2ComponentStore> mStore;
     std::vector<std::shared_ptr<C2ParamReflector>> mParamReflectors;
 
-    // Reflector helper for MultiAccessUnitHelper
-    std::shared_ptr<C2ReflectorHelper> mMultiAccessUnitReflector;
-
     std::map<C2Param::CoreIndex, std::shared_ptr<C2StructDescriptor>> mStructDescriptors;
     std::set<C2Param::CoreIndex> mUnsupportedStructDescriptors;
     std::set<C2String> mLoadedInterfaces;

diff --git a/media/codec2/hal/hidl/1.1/utils/ComponentStore.cpp b/media/codec2/hal/hidl/1.1/utils/ComponentStore.cpp
@@ -146,14 +146,6 @@ ComponentStore::ComponentStore(const std::shared_ptr<C2ComponentStore>& store)
     }
 #endif
 
-    // MultiAccessUnit reflector helper is allocated once per store.
-    // All components in this store can reuse this reflector helper.
-    if (MultiAccessUnitHelper::isEnabledOnPlatform()) {
-        std::shared_ptr<C2ReflectorHelper> helper = std::make_shared<C2ReflectorHelper>();
-        mParamReflectors.push_back(helper);
-        mMultiAccessUnitReflector = helper;
-    }
-
     // Retrieve supported parameters from store
     using namespace std::placeholders;
     mInit = mConfigurable->init(mParameterCache);
@@ -235,10 +227,13 @@ std::shared_ptr<MultiAccessUnitInterface> ComponentStore::tryCreateMultiAccessUn
                     break;
                 }
             }
+
             if (!isComponentSupportsLargeAudioFrame) {
+                std::shared_ptr<C2ReflectorHelper> multiAccessReflector(new C2ReflectorHelper());
                 multiAccessUnitIntf = std::make_shared<MultiAccessUnitInterface>(
                         c2interface,
-                        mMultiAccessUnitReflector);
+                        multiAccessReflector);
+                mParamReflectors.push_back(multiAccessReflector);
             }
         }
     }

diff --git a/media/codec2/hal/hidl/1.1/utils/include/codec2/hidl/1.1/ComponentStore.h b/media/codec2/hal/hidl/1.1/utils/include/codec2/hidl/1.1/ComponentStore.h
@@ -139,9 +139,6 @@ struct ComponentStore : public IComponentStore {
     std::shared_ptr<C2ComponentStore> mStore;
     std::vector<std::shared_ptr<C2ParamReflector>> mParamReflectors;
 
-    // Reflector helper for MultiAccessUnitHelper
-    std::shared_ptr<C2ReflectorHelper> mMultiAccessUnitReflector;
-
     std::map<C2Param::CoreIndex, std::shared_ptr<C2StructDescriptor>> mStructDescriptors;
     std::set<C2Param::CoreIndex> mUnsupportedStructDescriptors;
     std::set<C2String> mLoadedInterfaces;

diff --git a/media/codec2/hal/hidl/1.2/utils/ComponentStore.cpp b/media/codec2/hal/hidl/1.2/utils/ComponentStore.cpp
@@ -146,14 +146,6 @@ ComponentStore::ComponentStore(const std::shared_ptr<C2ComponentStore>& store)
     }
 #endif
 
-    // MultiAccessUnit reflector helper is allocated once per store.
-    // All components in this store can reuse this reflector helper.
-    if (MultiAccessUnitHelper::isEnabledOnPlatform()) {
-        std::shared_ptr<C2ReflectorHelper> helper = std::make_shared<C2ReflectorHelper>();
-        mParamReflectors.push_back(helper);
-        mMultiAccessUnitReflector = helper;
-    }
-
     // Retrieve supported parameters from store
     using namespace std::placeholders;
     mInit = mConfigurable->init(mParameterCache);
@@ -236,9 +228,11 @@ std::shared_ptr<MultiAccessUnitInterface> ComponentStore::tryCreateMultiAccessUn
                 }
             }
             if (!isComponentSupportsLargeAudioFrame) {
+                std::shared_ptr<C2ReflectorHelper> multiAccessReflector(new C2ReflectorHelper());
                 multiAccessUnitIntf = std::make_shared<MultiAccessUnitInterface>(
                         c2interface,
-                        mMultiAccessUnitReflector);
+                        multiAccessReflector);
+                mParamReflectors.push_back(multiAccessReflector);
             }
         }
     }