summaryrefslogtreecommitdiffstats
path: root/media/libmedia/mediarecorder.cpp
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2011-10-20 11:56:00 +0100
committerSteve Block <steveblock@google.com>2011-10-26 09:57:54 +0100
commit3856b090cd04ba5dd4a59a12430ed724d5995909 (patch)
treea24e4c98fa6049fd8085826be838000f9a67e39b /media/libmedia/mediarecorder.cpp
parent1d2acaffde56ad79e6e96f228d7857863462397c (diff)
downloadframeworks_av-3856b090cd04ba5dd4a59a12430ed724d5995909.zip
frameworks_av-3856b090cd04ba5dd4a59a12430ed724d5995909.tar.gz
frameworks_av-3856b090cd04ba5dd4a59a12430ed724d5995909.tar.bz2
Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/#/c/143865 Bug: 5449033 Change-Id: I0122812ed6ff6f5b59fe4a43ab8bff0577adde0a
Diffstat (limited to 'media/libmedia/mediarecorder.cpp')
-rw-r--r--media/libmedia/mediarecorder.cpp82
1 files changed, 41 insertions, 41 deletions
diff --git a/media/libmedia/mediarecorder.cpp b/media/libmedia/mediarecorder.cpp
index 11d281f..ec62978 100644
--- a/media/libmedia/mediarecorder.cpp
+++ b/media/libmedia/mediarecorder.cpp
@@ -31,7 +31,7 @@ namespace android {
status_t MediaRecorder::setCamera(const sp<ICamera>& camera, const sp<ICameraRecordingProxy>& proxy)
{
- LOGV("setCamera(%p,%p)", camera.get(), proxy.get());
+ ALOGV("setCamera(%p,%p)", camera.get(), proxy.get());
if(mMediaRecorder == NULL) {
LOGE("media recorder is not initialized yet");
return INVALID_OPERATION;
@@ -43,7 +43,7 @@ status_t MediaRecorder::setCamera(const sp<ICamera>& camera, const sp<ICameraRec
status_t ret = mMediaRecorder->setCamera(camera, proxy);
if (OK != ret) {
- LOGV("setCamera failed: %d", ret);
+ ALOGV("setCamera failed: %d", ret);
mCurrentState = MEDIA_RECORDER_ERROR;
return ret;
}
@@ -52,7 +52,7 @@ status_t MediaRecorder::setCamera(const sp<ICamera>& camera, const sp<ICameraRec
status_t MediaRecorder::setPreviewSurface(const sp<Surface>& surface)
{
- LOGV("setPreviewSurface(%p)", surface.get());
+ ALOGV("setPreviewSurface(%p)", surface.get());
if(mMediaRecorder == NULL) {
LOGE("media recorder is not initialized yet");
return INVALID_OPERATION;
@@ -68,7 +68,7 @@ status_t MediaRecorder::setPreviewSurface(const sp<Surface>& surface)
status_t ret = mMediaRecorder->setPreviewSurface(surface);
if (OK != ret) {
- LOGV("setPreviewSurface failed: %d", ret);
+ ALOGV("setPreviewSurface failed: %d", ret);
mCurrentState = MEDIA_RECORDER_ERROR;
return ret;
}
@@ -77,7 +77,7 @@ status_t MediaRecorder::setPreviewSurface(const sp<Surface>& surface)
status_t MediaRecorder::init()
{
- LOGV("init");
+ ALOGV("init");
if(mMediaRecorder == NULL) {
LOGE("media recorder is not initialized yet");
return INVALID_OPERATION;
@@ -89,14 +89,14 @@ status_t MediaRecorder::init()
status_t ret = mMediaRecorder->init();
if (OK != ret) {
- LOGV("init failed: %d", ret);
+ ALOGV("init failed: %d", ret);
mCurrentState = MEDIA_RECORDER_ERROR;
return ret;
}
ret = mMediaRecorder->setListener(this);
if (OK != ret) {
- LOGV("setListener failed: %d", ret);
+ ALOGV("setListener failed: %d", ret);
mCurrentState = MEDIA_RECORDER_ERROR;
return ret;
}
@@ -107,7 +107,7 @@ status_t MediaRecorder::init()
status_t MediaRecorder::setVideoSource(int vs)
{
- LOGV("setVideoSource(%d)", vs);
+ ALOGV("setVideoSource(%d)", vs);
if(mMediaRecorder == NULL) {
LOGE("media recorder is not initialized yet");
return INVALID_OPERATION;
@@ -117,7 +117,7 @@ status_t MediaRecorder::setVideoSource(int vs)
return INVALID_OPERATION;
}
if (mCurrentState & MEDIA_RECORDER_IDLE) {
- LOGV("Call init() since the media recorder is not initialized yet");
+ ALOGV("Call init() since the media recorder is not initialized yet");
status_t ret = init();
if (OK != ret) {
return ret;
@@ -132,7 +132,7 @@ status_t MediaRecorder::setVideoSource(int vs)
status_t ret = mMediaRecorder->setVideoSource(vs);
if (OK != ret) {
- LOGV("setVideoSource failed: %d", ret);
+ ALOGV("setVideoSource failed: %d", ret);
mCurrentState = MEDIA_RECORDER_ERROR;
return ret;
}
@@ -142,13 +142,13 @@ status_t MediaRecorder::setVideoSource(int vs)
status_t MediaRecorder::setAudioSource(int as)
{
- LOGV("setAudioSource(%d)", as);
+ ALOGV("setAudioSource(%d)", as);
if(mMediaRecorder == NULL) {
LOGE("media recorder is not initialized yet");
return INVALID_OPERATION;
}
if (mCurrentState & MEDIA_RECORDER_IDLE) {
- LOGV("Call init() since the media recorder is not initialized yet");
+ ALOGV("Call init() since the media recorder is not initialized yet");
status_t ret = init();
if (OK != ret) {
return ret;
@@ -165,7 +165,7 @@ status_t MediaRecorder::setAudioSource(int as)
status_t ret = mMediaRecorder->setAudioSource(as);
if (OK != ret) {
- LOGV("setAudioSource failed: %d", ret);
+ ALOGV("setAudioSource failed: %d", ret);
mCurrentState = MEDIA_RECORDER_ERROR;
return ret;
}
@@ -175,7 +175,7 @@ status_t MediaRecorder::setAudioSource(int as)
status_t MediaRecorder::setOutputFormat(int of)
{
- LOGV("setOutputFormat(%d)", of);
+ ALOGV("setOutputFormat(%d)", of);
if(mMediaRecorder == NULL) {
LOGE("media recorder is not initialized yet");
return INVALID_OPERATION;
@@ -201,7 +201,7 @@ status_t MediaRecorder::setOutputFormat(int of)
status_t MediaRecorder::setVideoEncoder(int ve)
{
- LOGV("setVideoEncoder(%d)", ve);
+ ALOGV("setVideoEncoder(%d)", ve);
if(mMediaRecorder == NULL) {
LOGE("media recorder is not initialized yet");
return INVALID_OPERATION;
@@ -221,7 +221,7 @@ status_t MediaRecorder::setVideoEncoder(int ve)
status_t ret = mMediaRecorder->setVideoEncoder(ve);
if (OK != ret) {
- LOGV("setVideoEncoder failed: %d", ret);
+ ALOGV("setVideoEncoder failed: %d", ret);
mCurrentState = MEDIA_RECORDER_ERROR;
return ret;
}
@@ -231,7 +231,7 @@ status_t MediaRecorder::setVideoEncoder(int ve)
status_t MediaRecorder::setAudioEncoder(int ae)
{
- LOGV("setAudioEncoder(%d)", ae);
+ ALOGV("setAudioEncoder(%d)", ae);
if(mMediaRecorder == NULL) {
LOGE("media recorder is not initialized yet");
return INVALID_OPERATION;
@@ -251,7 +251,7 @@ status_t MediaRecorder::setAudioEncoder(int ae)
status_t ret = mMediaRecorder->setAudioEncoder(ae);
if (OK != ret) {
- LOGV("setAudioEncoder failed: %d", ret);
+ ALOGV("setAudioEncoder failed: %d", ret);
mCurrentState = MEDIA_RECORDER_ERROR;
return ret;
}
@@ -261,7 +261,7 @@ status_t MediaRecorder::setAudioEncoder(int ae)
status_t MediaRecorder::setOutputFile(const char* path)
{
- LOGV("setOutputFile(%s)", path);
+ ALOGV("setOutputFile(%s)", path);
if(mMediaRecorder == NULL) {
LOGE("media recorder is not initialized yet");
return INVALID_OPERATION;
@@ -277,7 +277,7 @@ status_t MediaRecorder::setOutputFile(const char* path)
status_t ret = mMediaRecorder->setOutputFile(path);
if (OK != ret) {
- LOGV("setOutputFile failed: %d", ret);
+ ALOGV("setOutputFile failed: %d", ret);
mCurrentState = MEDIA_RECORDER_ERROR;
return ret;
}
@@ -287,7 +287,7 @@ status_t MediaRecorder::setOutputFile(const char* path)
status_t MediaRecorder::setOutputFile(int fd, int64_t offset, int64_t length)
{
- LOGV("setOutputFile(%d, %lld, %lld)", fd, offset, length);
+ ALOGV("setOutputFile(%d, %lld, %lld)", fd, offset, length);
if(mMediaRecorder == NULL) {
LOGE("media recorder is not initialized yet");
return INVALID_OPERATION;
@@ -314,7 +314,7 @@ status_t MediaRecorder::setOutputFile(int fd, int64_t offset, int64_t length)
status_t ret = mMediaRecorder->setOutputFile(fd, offset, length);
if (OK != ret) {
- LOGV("setOutputFile failed: %d", ret);
+ ALOGV("setOutputFile failed: %d", ret);
mCurrentState = MEDIA_RECORDER_ERROR;
return ret;
}
@@ -324,7 +324,7 @@ status_t MediaRecorder::setOutputFile(int fd, int64_t offset, int64_t length)
status_t MediaRecorder::setVideoSize(int width, int height)
{
- LOGV("setVideoSize(%d, %d)", width, height);
+ ALOGV("setVideoSize(%d, %d)", width, height);
if(mMediaRecorder == NULL) {
LOGE("media recorder is not initialized yet");
return INVALID_OPERATION;
@@ -367,7 +367,7 @@ sp<ISurfaceTexture> MediaRecorder::
status_t MediaRecorder::setVideoFrameRate(int frames_per_second)
{
- LOGV("setVideoFrameRate(%d)", frames_per_second);
+ ALOGV("setVideoFrameRate(%d)", frames_per_second);
if(mMediaRecorder == NULL) {
LOGE("media recorder is not initialized yet");
return INVALID_OPERATION;
@@ -391,7 +391,7 @@ status_t MediaRecorder::setVideoFrameRate(int frames_per_second)
}
status_t MediaRecorder::setParameters(const String8& params) {
- LOGV("setParameters(%s)", params.string());
+ ALOGV("setParameters(%s)", params.string());
if(mMediaRecorder == NULL) {
LOGE("media recorder is not initialized yet");
return INVALID_OPERATION;
@@ -419,7 +419,7 @@ status_t MediaRecorder::setParameters(const String8& params) {
status_t MediaRecorder::prepare()
{
- LOGV("prepare");
+ ALOGV("prepare");
if(mMediaRecorder == NULL) {
LOGE("media recorder is not initialized yet");
return INVALID_OPERATION;
@@ -458,7 +458,7 @@ status_t MediaRecorder::prepare()
status_t MediaRecorder::getMaxAmplitude(int* max)
{
- LOGV("getMaxAmplitude");
+ ALOGV("getMaxAmplitude");
if(mMediaRecorder == NULL) {
LOGE("media recorder is not initialized yet");
return INVALID_OPERATION;
@@ -479,7 +479,7 @@ status_t MediaRecorder::getMaxAmplitude(int* max)
status_t MediaRecorder::start()
{
- LOGV("start");
+ ALOGV("start");
if (mMediaRecorder == NULL) {
LOGE("media recorder is not initialized yet");
return INVALID_OPERATION;
@@ -501,7 +501,7 @@ status_t MediaRecorder::start()
status_t MediaRecorder::stop()
{
- LOGV("stop");
+ ALOGV("stop");
if (mMediaRecorder == NULL) {
LOGE("media recorder is not initialized yet");
return INVALID_OPERATION;
@@ -529,7 +529,7 @@ status_t MediaRecorder::stop()
// Reset should be OK in any state
status_t MediaRecorder::reset()
{
- LOGV("reset");
+ ALOGV("reset");
if (mMediaRecorder == NULL) {
LOGE("media recorder is not initialized yet");
return INVALID_OPERATION;
@@ -565,7 +565,7 @@ status_t MediaRecorder::reset()
status_t MediaRecorder::close()
{
- LOGV("close");
+ ALOGV("close");
if (!(mCurrentState & MEDIA_RECORDER_INITIALIZED)) {
LOGE("close called in an invalid state: %d", mCurrentState);
return INVALID_OPERATION;
@@ -583,7 +583,7 @@ status_t MediaRecorder::close()
status_t MediaRecorder::doReset()
{
- LOGV("doReset");
+ ALOGV("doReset");
status_t ret = mMediaRecorder->reset();
if (OK != ret) {
LOGE("doReset failed: %d", ret);
@@ -597,7 +597,7 @@ status_t MediaRecorder::doReset()
void MediaRecorder::doCleanUp()
{
- LOGV("doCleanUp");
+ ALOGV("doCleanUp");
mIsAudioSourceSet = false;
mIsVideoSourceSet = false;
mIsAudioEncoderSet = false;
@@ -608,7 +608,7 @@ void MediaRecorder::doCleanUp()
// Release should be OK in any state
status_t MediaRecorder::release()
{
- LOGV("release");
+ ALOGV("release");
if (mMediaRecorder != NULL) {
return mMediaRecorder->release();
}
@@ -617,7 +617,7 @@ status_t MediaRecorder::release()
MediaRecorder::MediaRecorder() : mSurfaceMediaSource(NULL)
{
- LOGV("constructor");
+ ALOGV("constructor");
const sp<IMediaPlayerService>& service(getMediaPlayerService());
if (service != NULL) {
@@ -638,7 +638,7 @@ status_t MediaRecorder::initCheck()
MediaRecorder::~MediaRecorder()
{
- LOGV("destructor");
+ ALOGV("destructor");
if (mMediaRecorder != NULL) {
mMediaRecorder.clear();
}
@@ -650,7 +650,7 @@ MediaRecorder::~MediaRecorder()
status_t MediaRecorder::setListener(const sp<MediaRecorderListener>& listener)
{
- LOGV("setListener");
+ ALOGV("setListener");
Mutex::Autolock _l(mLock);
mListener = listener;
@@ -659,7 +659,7 @@ status_t MediaRecorder::setListener(const sp<MediaRecorderListener>& listener)
void MediaRecorder::notify(int msg, int ext1, int ext2)
{
- LOGV("message received msg=%d, ext1=%d, ext2=%d", msg, ext1, ext2);
+ ALOGV("message received msg=%d, ext1=%d, ext2=%d", msg, ext1, ext2);
sp<MediaRecorderListener> listener;
mLock.lock();
@@ -668,15 +668,15 @@ void MediaRecorder::notify(int msg, int ext1, int ext2)
if (listener != NULL) {
Mutex::Autolock _l(mNotifyLock);
- LOGV("callback application");
+ ALOGV("callback application");
listener->notify(msg, ext1, ext2);
- LOGV("back from callback");
+ ALOGV("back from callback");
}
}
void MediaRecorder::died()
{
- LOGV("died");
+ ALOGV("died");
notify(MEDIA_RECORDER_EVENT_ERROR, MEDIA_ERROR_SERVER_DIED, 0);
}