Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

auto import from //depot/cupcake/@132589

Browse Source
This commit is contained in:
The Android Open Source Project
2009-03-03 14:04:24 -08:00
parent 3dec7d563a
commit 076357b856
310 changed files with 4072 additions and 18131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/media/AudioRecord.h
View File

@@ -125,8 +125,7 @@ public:
* channelCount: Number of PCM channels (e.g 2 for stereo).
* frameCount: Total size of track PCM buffer in frames. This defines the
* latency of the track.
* flags: A bitmask of acoustic values from enum record_flags. It enables
* AGC, NS, and IIR.
* flags: Reserved for future use.
* cbf: Callback function. If not null, this function is called periodically
* to provide new PCM data.
* notificationFrames: The callback function is called each time notificationFrames PCM
@@ -134,12 +133,6 @@ public:
* user Context for use by the callback receiver.
*/
enum record_flags {
RECORD_AGC_ENABLE = AudioSystem::AGC_ENABLE,
RECORD_NS_ENABLE = AudioSystem::NS_ENABLE,
RECORD_IIR_ENABLE = AudioSystem::TX_IIR_ENABLE
};
AudioRecord(int streamType,
uint32_t sampleRate = 0,
int format = 0,

2
include/media/IMediaRecorder.h
View File

@@ -24,7 +24,6 @@ namespace android {
class ISurface;
class ICamera;
class IMediaPlayerClient;
class IMediaRecorder: public IInterface
{
@@ -42,7 +41,6 @@ public:
virtual status_t setOutputFile(int fd, int64_t offset, int64_t length) = 0;
virtual status_t setVideoSize(int width, int height) = 0;
virtual status_t setVideoFrameRate(int frames_per_second) = 0;
virtual status_t setListener(const sp<IMediaPlayerClient>& listener) = 0;
virtual status_t prepare() = 0;
virtual status_t getMaxAmplitude(int* max) = 0;
virtual status_t start() = 0;

2
include/media/PVMediaRecorder.h
View File

@@ -19,7 +19,6 @@
#define ANDROID_PVMEDIARECORDER_H
#include <media/mediarecorder.h>
#include <media/IMediaPlayerClient.h>
namespace android {
@@ -45,7 +44,6 @@ public:
status_t setPreviewSurface(const sp<ISurface>& surface);
status_t setOutputFile(const char *path);
status_t setOutputFile(int fd, int64_t offset, int64_t length);
status_t setListener(const sp<IMediaPlayerClient>& listener);
status_t prepare();
status_t start();
status_t stop();

39
include/media/mediarecorder.h
View File

@@ -19,7 +19,6 @@
#define ANDROID_MEDIARECORDER_H
#include <utils.h>
#include <media/IMediaPlayerClient.h>
namespace android {
@@ -88,24 +87,7 @@ enum media_recorder_states {
MEDIA_RECORDER_RECORDING = 1 << 4,
};
// The "msg" code passed to the listener in notify.
enum {
MEDIA_RECORDER_EVENT_ERROR = 1
};
enum {
MEDIA_RECORDER_ERROR_UNKNOWN = 1
};
// ----------------------------------------------------------------------------
// ref-counted object for callbacks
class MediaRecorderListener: virtual public RefBase
{
public:
virtual void notify(int msg, int ext1, int ext2) = 0;
};
class MediaRecorder : public BnMediaPlayerClient
class MediaRecorder
{
public:
MediaRecorder();
@@ -123,7 +105,6 @@ public:
status_t setOutputFile(int fd, int64_t offset, int64_t length);
status_t setVideoSize(int width, int height);
status_t setVideoFrameRate(int frames_per_second);
status_t setListener(const sp<MediaRecorderListener>& listener);
status_t prepare();
status_t getMaxAmplitude(int* max);
status_t start();
@@ -132,22 +113,18 @@ public:
status_t init();
status_t close();
status_t release();
void notify(int msg, int ext1, int ext2);
private:
void doCleanUp();
status_t doReset();
sp<IMediaRecorder> mMediaRecorder;
sp<MediaRecorderListener> mListener;
media_recorder_states mCurrentState;
bool mIsAudioSourceSet;
bool mIsVideoSourceSet;
bool mIsAudioEncoderSet;
bool mIsVideoEncoderSet;
bool mIsOutputFileSet;
Mutex mLock;
Mutex mNotifyLock;
sp<IMediaRecorder> mMediaRecorder;
media_recorder_states mCurrentState;
bool mIsAudioSourceSet;
bool mIsVideoSourceSet;
bool mIsAudioEncoderSet;
bool mIsVideoEncoderSet;
bool mIsOutputFileSet;
};
}; // namespace android

3
include/ui/CameraHardwareInterface.h
View File

@@ -87,9 +87,6 @@ public:
/** Return the IMemoryHeap for the preview image heap */
virtual sp<IMemoryHeap> getPreviewHeap() const = 0;
/** Return the IMemoryHeap for the raw image heap */
virtual sp<IMemoryHeap> getRawHeap() const = 0;
/**
* Start preview mode. When a preview image is available
* preview_callback is called with the user parameter. The

16
include/utils/ResourceTypes.h
View File

@@ -1101,22 +1101,16 @@ struct ResTable_config
return false;
}
// Return true if 'this' can be considered a match for the parameters in
// Return true if 'this' can be considered a match for the parameters in
// 'settings'.
// Note this is asymetric. A default piece of data will match every request
// but a request for the default should not match odd specifics
// (ie, request with no mcc should not match a particular mcc's data)
// settings is the requested settings
inline bool match(const ResTable_config& settings) const {
if (imsi != 0) {
if ((settings.mcc != 0 && mcc != 0
&& mcc != settings.mcc) ||
(settings.mcc == 0 && mcc != 0)) {
if (settings.mcc != 0 && mcc != 0
&& mcc != settings.mcc) {
return false;
}
if ((settings.mnc != 0 && mnc != 0
&& mnc != settings.mnc) ||
(settings.mnc == 0 && mnc != 0)) {
if (settings.mnc != 0 && mnc != 0
&& mnc != settings.mnc) {
return false;
}
}