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

Commit 68d42e38 authored by James Dong's avatar James Dong Committed by Android Git Automerger
Browse files

am c2c59f69: am 2a76b316: Merge "Separate MediaRecorderClient with... 

am c2c59f69: am 2a76b316: Merge "Separate MediaRecorderClient with MediaPlayerClient" into gingerbread

Merge commit 'c2c59f69'

* commit 'c2c59f69':
  Separate MediaRecorderClient with MediaPlayerClient
parents ab359395 c2c59f69

include/media/IMediaRecorder.h

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ namespace android { 


class ISurface;

class ICamera;

class IMediaPlayerClient;

class IMediaRecorderClient;



class IMediaRecorder: public IInterface

{
@@ -43,7 +43,7 @@ public: 
    virtual	status_t		setVideoSize(int width, int height) = 0;

    virtual	status_t		setVideoFrameRate(int frames_per_second) = 0;

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

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

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

    virtual	status_t		prepare() = 0;

    virtual	status_t		getMaxAmplitude(int* max) = 0;

    virtual	status_t		start() = 0;

include/media/IMediaRecorderClient.h

0 → 100644
+48 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2010 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#ifndef ANDROID_IMEDIARECORDERCLIENT_H

#define ANDROID_IMEDIARECORDERCLIENT_H



#include <utils/RefBase.h>

#include <binder/IInterface.h>

#include <binder/Parcel.h>



namespace android {



class IMediaRecorderClient: public IInterface

{

public:

    DECLARE_META_INTERFACE(MediaRecorderClient);



    virtual void notify(int msg, int ext1, int ext2) = 0;

};



// ----------------------------------------------------------------------------



class BnMediaRecorderClient: public BnInterface<IMediaRecorderClient>

{

public:

    virtual status_t    onTransact( uint32_t code,

                                    const Parcel& data,

                                    Parcel* reply,

                                    uint32_t flags = 0);

};



}; // namespace android



#endif // ANDROID_IMEDIARECORDERCLIENT_H

include/media/MediaRecorderBase.h

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ struct MediaRecorderBase { 
    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;

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

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

    virtual status_t prepare() = 0;

    virtual status_t start() = 0;

    virtual status_t stop() = 0;

include/media/PVMediaRecorder.h

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#ifndef ANDROID_PVMEDIARECORDER_H

#define ANDROID_PVMEDIARECORDER_H



#include <media/IMediaPlayerClient.h>

#include <media/IMediaRecorderClient.h>

#include <media/MediaRecorderBase.h>



namespace android {
@@ -45,7 +45,7 @@ public: 
    virtual status_t setOutputFile(const char *path);

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

    virtual status_t setParameters(const String8& params);

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

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

    virtual status_t prepare();

    virtual status_t start();

    virtual status_t stop();

include/media/mediarecorder.h

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
#include <utils/threads.h>

#include <utils/List.h>

#include <utils/Errors.h>

#include <media/IMediaPlayerClient.h>

#include <media/IMediaRecorderClient.h>

#include <media/IMediaDeathNotifier.h>



namespace android {
@@ -149,7 +149,7 @@ public: 
    virtual void notify(int msg, int ext1, int ext2) = 0;

};



class MediaRecorder : public BnMediaPlayerClient,

class MediaRecorder : public BnMediaRecorderClient,

                      public virtual IMediaDeathNotifier

{

public: