summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--media/java/android/media/quality/Android.bp27
-rw-r--r--media/java/android/media/quality/aidl/android/media/quality/ActiveProcessingPicture.aidl2
-rw-r--r--media/java/android/media/quality/aidl/android/media/quality/AmbientBacklightEvent.aidl2
-rw-r--r--media/java/android/media/quality/aidl/android/media/quality/AmbientBacklightMetadata.aidl2
-rw-r--r--media/java/android/media/quality/aidl/android/media/quality/AmbientBacklightSettings.aidl2
-rw-r--r--media/java/android/media/quality/aidl/android/media/quality/ParameterCapability.aidl2
-rw-r--r--media/java/android/media/quality/aidl/android/media/quality/PictureProfile.aidl2
-rw-r--r--media/java/android/media/quality/aidl/android/media/quality/PictureProfileHandle.aidl2
-rw-r--r--media/java/android/media/quality/aidl/android/media/quality/SoundProfile.aidl2
-rw-r--r--media/java/android/media/quality/include/quality/MediaQualityManager.h127
10 files changed, 161 insertions, 9 deletions
diff --git a/media/java/android/media/quality/Android.bp b/media/java/android/media/quality/Android.bp
index 080d5266ccb7..f620144e2880 100644
--- a/media/java/android/media/quality/Android.bp
+++ b/media/java/android/media/quality/Android.bp
@@ -15,6 +15,30 @@ filegroup {
path: "aidl",
}
+cc_library_headers {
+ name: "media_quality_headers",
+ export_include_dirs: ["include"],
+}
+
+cc_library_shared {
+ name: "libmedia_quality_include",
+
+ export_include_dirs: ["include"],
+ cflags: [
+ "-Wno-unused-variable",
+ "-Wunused-parameter",
+ ],
+
+ shared_libs: [
+ "libbinder",
+ "libutils",
+ ],
+
+ srcs: [
+ ":framework-media-quality-sources-aidl",
+ ],
+}
+
aidl_interface {
name: "media_quality_aidl_interface",
unstable: true,
@@ -24,7 +48,8 @@ aidl_interface {
enabled: true,
},
cpp: {
- enabled: false,
+ additional_shared_libraries: ["libmedia_quality_include"],
+ enabled: true,
},
ndk: {
enabled: false,
diff --git a/media/java/android/media/quality/aidl/android/media/quality/ActiveProcessingPicture.aidl b/media/java/android/media/quality/aidl/android/media/quality/ActiveProcessingPicture.aidl
index 2851306f6e4d..d2cf140632ab 100644
--- a/media/java/android/media/quality/aidl/android/media/quality/ActiveProcessingPicture.aidl
+++ b/media/java/android/media/quality/aidl/android/media/quality/ActiveProcessingPicture.aidl
@@ -16,4 +16,4 @@
package android.media.quality;
-parcelable ActiveProcessingPicture; \ No newline at end of file
+parcelable ActiveProcessingPicture cpp_header "quality/MediaQualityManager.h"; \ No newline at end of file
diff --git a/media/java/android/media/quality/aidl/android/media/quality/AmbientBacklightEvent.aidl b/media/java/android/media/quality/aidl/android/media/quality/AmbientBacklightEvent.aidl
index 174cd461e846..d53860fdf9ad 100644
--- a/media/java/android/media/quality/aidl/android/media/quality/AmbientBacklightEvent.aidl
+++ b/media/java/android/media/quality/aidl/android/media/quality/AmbientBacklightEvent.aidl
@@ -16,4 +16,4 @@
package android.media.quality;
-parcelable AmbientBacklightEvent;
+parcelable AmbientBacklightEvent cpp_header "quality/MediaQualityManager.h";
diff --git a/media/java/android/media/quality/aidl/android/media/quality/AmbientBacklightMetadata.aidl b/media/java/android/media/quality/aidl/android/media/quality/AmbientBacklightMetadata.aidl
index b95a474fbf90..a935b49b5d23 100644
--- a/media/java/android/media/quality/aidl/android/media/quality/AmbientBacklightMetadata.aidl
+++ b/media/java/android/media/quality/aidl/android/media/quality/AmbientBacklightMetadata.aidl
@@ -16,4 +16,4 @@
package android.media.quality;
-parcelable AmbientBacklightMetadata; \ No newline at end of file
+parcelable AmbientBacklightMetadata cpp_header "quality/MediaQualityManager.h"; \ No newline at end of file
diff --git a/media/java/android/media/quality/aidl/android/media/quality/AmbientBacklightSettings.aidl b/media/java/android/media/quality/aidl/android/media/quality/AmbientBacklightSettings.aidl
index e2cdd03194cd..051aef80b948 100644
--- a/media/java/android/media/quality/aidl/android/media/quality/AmbientBacklightSettings.aidl
+++ b/media/java/android/media/quality/aidl/android/media/quality/AmbientBacklightSettings.aidl
@@ -16,4 +16,4 @@
package android.media.quality;
-parcelable AmbientBacklightSettings;
+parcelable AmbientBacklightSettings cpp_header "quality/MediaQualityManager.h";
diff --git a/media/java/android/media/quality/aidl/android/media/quality/ParameterCapability.aidl b/media/java/android/media/quality/aidl/android/media/quality/ParameterCapability.aidl
index eb2ac97916f3..ea848576e026 100644
--- a/media/java/android/media/quality/aidl/android/media/quality/ParameterCapability.aidl
+++ b/media/java/android/media/quality/aidl/android/media/quality/ParameterCapability.aidl
@@ -16,4 +16,4 @@
package android.media.quality;
-parcelable ParameterCapability;
+parcelable ParameterCapability cpp_header "quality/MediaQualityManager.h";
diff --git a/media/java/android/media/quality/aidl/android/media/quality/PictureProfile.aidl b/media/java/android/media/quality/aidl/android/media/quality/PictureProfile.aidl
index 41d018b12f33..b0fe3f5538f4 100644
--- a/media/java/android/media/quality/aidl/android/media/quality/PictureProfile.aidl
+++ b/media/java/android/media/quality/aidl/android/media/quality/PictureProfile.aidl
@@ -16,4 +16,4 @@
package android.media.quality;
-parcelable PictureProfile;
+parcelable PictureProfile cpp_header "quality/MediaQualityManager.h";
diff --git a/media/java/android/media/quality/aidl/android/media/quality/PictureProfileHandle.aidl b/media/java/android/media/quality/aidl/android/media/quality/PictureProfileHandle.aidl
index 5d14631dbb73..0582938b6ea7 100644
--- a/media/java/android/media/quality/aidl/android/media/quality/PictureProfileHandle.aidl
+++ b/media/java/android/media/quality/aidl/android/media/quality/PictureProfileHandle.aidl
@@ -16,4 +16,4 @@
package android.media.quality;
-parcelable PictureProfileHandle;
+parcelable PictureProfileHandle cpp_header "quality/MediaQualityManager.h";
diff --git a/media/java/android/media/quality/aidl/android/media/quality/SoundProfile.aidl b/media/java/android/media/quality/aidl/android/media/quality/SoundProfile.aidl
index e79fcaac97be..d93231fbf7e0 100644
--- a/media/java/android/media/quality/aidl/android/media/quality/SoundProfile.aidl
+++ b/media/java/android/media/quality/aidl/android/media/quality/SoundProfile.aidl
@@ -16,4 +16,4 @@
package android.media.quality;
-parcelable SoundProfile;
+parcelable SoundProfile cpp_header "quality/MediaQualityManager.h";
diff --git a/media/java/android/media/quality/include/quality/MediaQualityManager.h b/media/java/android/media/quality/include/quality/MediaQualityManager.h
new file mode 100644
index 000000000000..8c31667077c3
--- /dev/null
+++ b/media/java/android/media/quality/include/quality/MediaQualityManager.h
@@ -0,0 +1,127 @@
+#ifndef ANDROID_MEDIA_QUALITY_MANAGER_H
+#define ANDROID_MEDIA_QUALITY_MANAGER_H
+
+
+namespace android {
+namespace media {
+namespace quality {
+
+// TODO: implement writeToParcel and readFromParcel
+
+class PictureProfileHandle : public Parcelable {
+ public:
+ PictureProfileHandle() {}
+ status_t writeToParcel(android::Parcel*) const override {
+ return 0;
+ }
+ status_t readFromParcel(const android::Parcel*) override {
+ return 0;
+ }
+ std::string toString() const {
+ return "";
+ }
+};
+
+class SoundProfile : public Parcelable {
+ public:
+ SoundProfile() {}
+ status_t writeToParcel(android::Parcel*) const override {
+ return 0;
+ }
+ status_t readFromParcel(const android::Parcel*) override {
+ return 0;
+ }
+ std::string toString() const {
+ return "";
+ }
+};
+
+class PictureProfile : public Parcelable {
+ public:
+ PictureProfile() {}
+ status_t writeToParcel(android::Parcel*) const override {
+ return 0;
+ }
+ status_t readFromParcel(const android::Parcel*) override {
+ return 0;
+ }
+ std::string toString() const {
+ return "";
+ }
+};
+
+class ActiveProcessingPicture : public Parcelable {
+ public:
+ ActiveProcessingPicture() {}
+ status_t writeToParcel(android::Parcel*) const override {
+ return 0;
+ }
+ status_t readFromParcel(const android::Parcel*) override {
+ return 0;
+ }
+ std::string toString() const {
+ return "";
+ }
+};
+
+class AmbientBacklightEvent : public Parcelable {
+ public:
+ AmbientBacklightEvent() {}
+ status_t writeToParcel(android::Parcel*) const override {
+ return 0;
+ }
+ status_t readFromParcel(const android::Parcel*) override {
+ return 0;
+ }
+ std::string toString() const {
+ return "";
+ }
+};
+
+class AmbientBacklightMetadata : public Parcelable {
+ public:
+ AmbientBacklightMetadata() {}
+ status_t writeToParcel(android::Parcel*) const override {
+ return 0;
+ }
+ status_t readFromParcel(const android::Parcel*) override {
+ return 0;
+ }
+ std::string toString() const {
+ return "";
+ }
+};
+
+class AmbientBacklightSettings : public Parcelable {
+ public:
+ AmbientBacklightSettings() {}
+ status_t writeToParcel(android::Parcel*) const override {
+ return 0;
+ }
+ status_t readFromParcel(const android::Parcel*) override {
+ return 0;
+ }
+ std::string toString() const {
+ return "";
+ }
+};
+
+class ParameterCapability : public Parcelable {
+ public:
+ ParameterCapability() {}
+ status_t writeToParcel(android::Parcel*) const override {
+ return 0;
+ }
+ status_t readFromParcel(const android::Parcel*) override {
+ return 0;
+ }
+ std::string toString() const {
+ return "";
+ }
+};
+
+} // namespace quality
+} // namespace media
+} // namespace android
+
+#endif