Camera: Various offline processing fixes
Notable fixes:
- Rework FrameProcessorBase so it accept and work with
offline sessions.
- Erase internal composite streams from offline stream list.
Bug: 135142453
Test: Camera CTS
Change-Id: I9dbc01e62fa94c1e0bfb84a8ddaa9e39ab4a7e34
diff --git a/services/camera/libcameraservice/common/CameraOfflineSessionBase.h b/services/camera/libcameraservice/common/CameraOfflineSessionBase.h
index 05ea7fb..1f835a9 100644
--- a/services/camera/libcameraservice/common/CameraOfflineSessionBase.h
+++ b/services/camera/libcameraservice/common/CameraOfflineSessionBase.h
@@ -22,6 +22,7 @@
#include <utils/Timers.h>
#include "camera/CaptureResult.h"
+#include "FrameProducer.h"
namespace android {
@@ -54,27 +55,17 @@
virtual ~NotificationListener() {}
};
-class CameraOfflineSessionBase : public virtual RefBase {
+class CameraOfflineSessionBase : public virtual FrameProducer {
public:
virtual ~CameraOfflineSessionBase();
virtual status_t initialize(
wp<NotificationListener> listener) = 0;
- // The session's original camera ID
- virtual const String8& getId() const = 0;
-
virtual status_t disconnect() = 0;
virtual status_t dump(int fd) = 0;
- /**
- * Capture result passing
- */
- virtual status_t waitForNextFrame(nsecs_t timeout) = 0;
-
- virtual status_t getNextResult(CaptureResult *frame) = 0;
-
// TODO: notification passing path
}; // class CameraOfflineSessionBase