Camera: Switch camera2 to auto-gen C++ binder interfaces
- Move camera service AIDL files to frameworks/av
- Build C++ interface stubs with AIDL tools
- Add necessary native-side parcelables and update existing ones
- Remove manually-written stubs, rearrange remaining manual stubs
- Adjust implementations to work with auto-generated stubs
- Adjust method signatures for auto-gen differences
- Add rich error messages using binder::Status
Bug: 25091611
Change-Id: I6f69f34b9d1a3f8d1fb7db87357363f8fa8483ff
diff --git a/camera/camera2/OutputConfiguration.cpp b/camera/camera2/OutputConfiguration.cpp
index 3505154..2c2c90b 100644
--- a/camera/camera2/OutputConfiguration.cpp
+++ b/camera/camera2/OutputConfiguration.cpp
@@ -16,9 +16,12 @@
*/
#define LOG_TAG "OutputConfiguration"
+//#define LOG_NDEBUG 0
+
#include <utils/Log.h>
#include <camera/camera2/OutputConfiguration.h>
+#include <gui/Surface.h>
#include <binder/Parcel.h>
namespace android {
@@ -27,17 +30,6 @@
const int OutputConfiguration::INVALID_ROTATION = -1;
const int OutputConfiguration::INVALID_SET_ID = -1;
-// Read empty strings without printing a false error message.
-String16 OutputConfiguration::readMaybeEmptyString16(const Parcel& parcel) {
- size_t len;
- const char16_t* str = parcel.readString16Inplace(&len);
- if (str != NULL) {
- return String16(str, len);
- } else {
- return String16();
- }
-}
-
sp<IGraphicBufferProducer> OutputConfiguration::getGraphicBufferProducer() const {
return mGbp;
}
@@ -50,33 +42,48 @@
return mSurfaceSetID;
}
-OutputConfiguration::OutputConfiguration(const Parcel& parcel) {
- status_t err;
+OutputConfiguration::OutputConfiguration() :
+ mRotation(INVALID_ROTATION),
+ mSurfaceSetID(INVALID_SET_ID) {
+}
+
+OutputConfiguration::OutputConfiguration(const Parcel& parcel) :
+ mRotation(INVALID_ROTATION),
+ mSurfaceSetID(INVALID_SET_ID) {
+ readFromParcel(&parcel);
+}
+
+status_t OutputConfiguration::readFromParcel(const Parcel* parcel) {
+ status_t err = OK;
int rotation = 0;
- if ((err = parcel.readInt32(&rotation)) != OK) {
+
+ if (parcel == nullptr) return BAD_VALUE;
+
+ if ((err = parcel->readInt32(&rotation)) != OK) {
ALOGE("%s: Failed to read rotation from parcel", __FUNCTION__);
- mGbp = NULL;
- mRotation = INVALID_ROTATION;
- return;
+ return err;
}
int setID = INVALID_SET_ID;
- if ((err = parcel.readInt32(&setID)) != OK) {
+ if ((err = parcel->readInt32(&setID)) != OK) {
ALOGE("%s: Failed to read surface set ID from parcel", __FUNCTION__);
- mGbp = NULL;
- mSurfaceSetID = INVALID_SET_ID;
- return;
+ return err;
}
- String16 name = readMaybeEmptyString16(parcel);
- const sp<IGraphicBufferProducer>& gbp =
- interface_cast<IGraphicBufferProducer>(parcel.readStrongBinder());
- mGbp = gbp;
+ view::Surface surfaceShim;
+ if ((err = surfaceShim.readFromParcel(parcel)) != OK) {
+ ALOGE("%s: Failed to read surface from parcel", __FUNCTION__);
+ return err;
+ }
+
+ mGbp = surfaceShim.graphicBufferProducer;
mRotation = rotation;
mSurfaceSetID = setID;
ALOGV("%s: OutputConfiguration: bp = %p, name = %s", __FUNCTION__,
- gbp.get(), String8(name).string());
+ mGbp.get(), String8(surfaceShim.name).string());
+
+ return err;
}
OutputConfiguration::OutputConfiguration(sp<IGraphicBufferProducer>& gbp, int rotation,
@@ -86,16 +93,25 @@
mSurfaceSetID = surfaceSetID;
}
-status_t OutputConfiguration::writeToParcel(Parcel& parcel) const {
+status_t OutputConfiguration::writeToParcel(Parcel* parcel) const {
- parcel.writeInt32(mRotation);
- parcel.writeInt32(mSurfaceSetID);
- parcel.writeString16(String16("unknown_name")); // name of surface
- sp<IBinder> b(IInterface::asBinder(mGbp));
- parcel.writeStrongBinder(b);
+ if (parcel == nullptr) return BAD_VALUE;
+ status_t err = OK;
+
+ err = parcel->writeInt32(mRotation);
+ if (err != OK) return err;
+
+ err = parcel->writeInt32(mSurfaceSetID);
+ if (err != OK) return err;
+
+ view::Surface surfaceShim;
+ surfaceShim.name = String16("unknown_name"); // name of surface
+ surfaceShim.graphicBufferProducer = mGbp;
+
+ err = surfaceShim.writeToParcel(parcel);
+ if (err != OK) return err;
return OK;
}
}; // namespace android
-