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

Commit 0f83f58a authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "camera: Add autofocus support to the media recorder" into froyo

parents e636497a f0bd5b81

api/current.xml

+14 −1
Original line number Diff line number Diff line
@@ -85299,6 +85299,19 @@ 
 visibility="public"

>

</constructor>

<method name="autoFocusCamera"

 return="void"

 abstract="false"

 native="true"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<exception name="IllegalStateException" type="java.lang.IllegalStateException">

</exception>

</method>

<method name="getAudioSourceMax"

 return="int"

 abstract="false"
@@ -238975,7 +238988,7 @@ 
<method name="availableProcessors"

 return="int"

 abstract="false"

 native="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

include/media/IMediaRecorder.h

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ public: 
    virtual	status_t		setVideoFrameRate(int frames_per_second) = 0;

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

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

    virtual     status_t                autoFocusCamera() = 0;

    virtual     status_t                setListener(const sp<IMediaPlayerClient>& listener) = 0;

    virtual	status_t		prepare() = 0;

    virtual	status_t		getMaxAmplitude(int* max) = 0;

include/media/MediaRecorderBase.h

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ struct MediaRecorderBase { 
    virtual status_t setOutputFile(int fd, int64_t offset, int64_t length) = 0;

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

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

    virtual status_t autoFocusCamera() = 0;

    virtual status_t setListener(const sp<IMediaPlayerClient>& listener) = 0;

    virtual status_t prepare() = 0;

    virtual status_t start() = 0;

include/media/PVMediaRecorder.h

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ public: 
    virtual status_t setOutputFile(int fd, int64_t offset, int64_t length);

    virtual status_t setParameters(const String8& params);

    virtual status_t setCameraParameters(const String8& params);

    virtual status_t autoFocusCamera();

    virtual status_t setListener(const sp<IMediaPlayerClient>& listener);

    virtual status_t prepare();

    virtual status_t start();

include/media/mediarecorder.h

+1 −0
Original line number Diff line number Diff line
@@ -168,6 +168,7 @@ public: 
    status_t    setVideoFrameRate(int frames_per_second);

    status_t    setParameters(const String8& params);

    status_t    setCameraParameters(const String8& params);

    status_t    autoFocusCamera();

    status_t    setListener(const sp<MediaRecorderListener>& listener);

    status_t    prepare();

    status_t    getMaxAmplitude(int* max);