Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69d71966 authored by Jamie Gennis's avatar Jamie Gennis Committed by Android (Google) Code Review
Browse files

Merge "Change the framework to use the new camera preview path."

parents 8da31dc8 85cfdd01

include/camera/Camera.h

+1 −4
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ 


namespace android {



class ISurface;



/*

 * A set of bit masks for specifying how the received preview frames are

 * handled before the previewCallback() call.
@@ -152,9 +150,8 @@ public: 


            status_t    getStatus() { return mStatus; }



            // pass the buffered ISurface to the camera service

            // pass the buffered Surface to the camera service

            status_t    setPreviewDisplay(const sp<Surface>& surface);

            status_t    setPreviewDisplay(const sp<ISurface>& surface);



            // start preview mode, must call setPreviewDisplay first

            status_t    startPreview();

include/camera/CameraHardwareInterface.h

+3 −2
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#define ANDROID_HARDWARE_CAMERA_HARDWARE_INTERFACE_H



#include <binder/IMemory.h>

#include <ui/egl/android_natives.h>

#include <utils/RefBase.h>

#include <surfaceflinger/ISurface.h>

#include <camera/Camera.h>
@@ -86,8 +87,8 @@ class CameraHardwareInterface : public virtual RefBase { 
public:

    virtual ~CameraHardwareInterface() { }



    /** Return the IMemoryHeap for the preview image heap */

    virtual sp<IMemoryHeap>         getPreviewHeap() const = 0;

    /** Set the ISurface from which the preview buffers should be dequeued */

    virtual status_t setPreviewWindow(const sp<ANativeWindow>& buf) = 0;



    /** Return the IMemoryHeap for the raw image heap */

    virtual sp<IMemoryHeap>         getRawHeap() const = 0;

include/camera/ICamera.h

+3 −3
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include <utils/RefBase.h>

#include <binder/IInterface.h>

#include <binder/Parcel.h>

#include <surfaceflinger/ISurface.h>

#include <surfaceflinger/Surface.h>

#include <binder/IMemory.h>

#include <utils/String8.h>

#include <camera/Camera.h>
@@ -45,8 +45,8 @@ public: 
    // allow other processes to use this ICamera interface

    virtual status_t        unlock() = 0;



    // pass the buffered ISurface to the camera service

    virtual status_t        setPreviewDisplay(const sp<ISurface>& surface) = 0;

    // pass the buffered Surface to the camera service

    virtual status_t        setPreviewDisplay(const sp<Surface>& surface) = 0;



    // set the preview callback flag to affect how the received frames from

    // preview are handled.

include/media/IMediaRecorder.h

+2 −3
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 


namespace android {



class ISurface;

class Surface;

class ICamera;

class IMediaRecorderClient;
@@ -32,7 +32,7 @@ public: 
    DECLARE_META_INTERFACE(MediaRecorder);



    virtual	status_t		setCamera(const sp<ICamera>& camera) = 0;

    virtual	status_t		setPreviewSurface(const sp<ISurface>& surface) = 0;

    virtual	status_t		setPreviewSurface(const sp<Surface>& surface) = 0;

    virtual	status_t		setVideoSource(int vs) = 0;

    virtual	status_t		setAudioSource(int as) = 0;

    virtual	status_t		setOutputFormat(int of) = 0;
@@ -68,4 +68,3 @@ public: 
}; // namespace android



#endif // ANDROID_IMEDIARECORDER_H

include/media/MediaRecorderBase.h

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 


namespace android {



class ISurface;

class Surface;



struct MediaRecorderBase {

    MediaRecorderBase() {}
@@ -37,7 +37,7 @@ struct MediaRecorderBase { 
    virtual status_t setVideoSize(int width, int height) = 0;

    virtual status_t setVideoFrameRate(int frames_per_second) = 0;

    virtual status_t setCamera(const sp<ICamera>& camera) = 0;

    virtual status_t setPreviewSurface(const sp<ISurface>& surface) = 0;

    virtual status_t setPreviewSurface(const sp<Surface>& surface) = 0;

    virtual status_t setOutputFile(const char *path) = 0;

    virtual status_t setOutputFile(int fd, int64_t offset, int64_t length) = 0;

    virtual status_t setParameters(const String8& params) = 0;