diff options
-rw-r--r-- | libaudio/AudioHardware.cpp | 110 | ||||
-rwxr-xr-x | libcamera/SecCamera.cpp | 216 | ||||
-rwxr-xr-x | libcamera/SecCameraHWInterface.cpp | 188 | ||||
-rw-r--r-- | libhwcomposer/SecHWC.cpp | 12 | ||||
-rwxr-xr-x | liblight/lights.c | 6 | ||||
-rw-r--r-- | overlay/frameworks/base/core/res/res/values/config.xml | 1 | ||||
-rw-r--r-- | recovery/Android.mk | 2 | ||||
-rw-r--r-- | recovery/recovery_ui.c | 115 | ||||
-rw-r--r-- | recovery/recovery_ui.cpp | 110 | ||||
-rw-r--r-- | sec_mm/sec_omx/sec_codecs/video/mfc_c110/dec/src/SsbSipMfcDecAPI.c | 8 | ||||
-rw-r--r-- | sec_mm/sec_omx/sec_codecs/video/mfc_c110/enc/src/SsbSipMfcEncAPI.c | 10 |
11 files changed, 386 insertions, 392 deletions
diff --git a/libaudio/AudioHardware.cpp b/libaudio/AudioHardware.cpp index a189510..14a13bf 100644 --- a/libaudio/AudioHardware.cpp +++ b/libaudio/AudioHardware.cpp @@ -148,7 +148,7 @@ void AudioHardware::loadRILD(void) mSecRilLibHandle = dlopen("libsecril-client.so", RTLD_NOW); if (mSecRilLibHandle) { - LOGV("libsecril-client.so is loaded"); + ALOGV("libsecril-client.so is loaded"); openClientRILD = (HRilClient (*)(void)) dlsym(mSecRilLibHandle, "OpenClient_RILD"); @@ -304,7 +304,7 @@ AudioStreamIn* AudioHardware::openInputStream( *status = rc; } - LOGV("AudioHardware::openInputStream()%p", in.get()); + ALOGV("AudioHardware::openInputStream()%p", in.get()); return in.get(); } @@ -322,7 +322,7 @@ void AudioHardware::closeInputStream(AudioStreamIn* in) { spIn = mInputs[index]; mInputs.removeAt(index); } - LOGV("AudioHardware::closeInputStream()%p", in); + ALOGV("AudioHardware::closeInputStream()%p", in); spIn.clear(); } @@ -374,7 +374,7 @@ status_t AudioHardware::setMode(int mode) int prevMode = mMode; status = AudioHardwareBase::setMode(mode); - LOGV("setMode() : new %d, old %d", mMode, prevMode); + ALOGV("setMode() : new %d, old %d", mMode, prevMode); if (status == NO_ERROR) { bool modeNeedsCPActive = mMode == AudioSystem::MODE_IN_CALL || mMode == AudioSystem::MODE_RINGTONE; @@ -389,15 +389,15 @@ status_t AudioHardware::setMode(int mode) if (mMode == AudioSystem::MODE_IN_CALL && !mInCallAudioMode) { if (spOut != 0) { - LOGV("setMode() in call force output standby"); + ALOGV("setMode() in call force output standby"); spOut->doStandby_l(); } if (spIn != 0) { - LOGV("setMode() in call force input standby"); + ALOGV("setMode() in call force input standby"); spIn->doStandby_l(); } - LOGV("setMode() openPcmOut_l()"); + ALOGV("setMode() openPcmOut_l()"); openPcmOut_l(); openMixer_l(); setInputSource_l(AUDIO_SOURCE_DEFAULT); @@ -411,22 +411,22 @@ status_t AudioHardware::setMode(int mode) struct mixer_ctl *ctl= mixer_get_ctl_by_name(mMixer, "Playback Path"); TRACE_DRIVER_OUT if (ctl != NULL) { - LOGV("setMode() reset Playback Path to RCV"); + ALOGV("setMode() reset Playback Path to RCV"); TRACE_DRIVER_IN(DRV_MIXER_SEL) mixer_ctl_set_enum_by_string(ctl, "RCV"); TRACE_DRIVER_OUT } } - LOGV("setMode() closePcmOut_l()"); + ALOGV("setMode() closePcmOut_l()"); closeMixer_l(); closePcmOut_l(); if (spOut != 0) { - LOGV("setMode() off call force output standby"); + ALOGV("setMode() off call force output standby"); spOut->doStandby_l(); } if (spIn != 0) { - LOGV("setMode() off call force input standby"); + ALOGV("setMode() off call force input standby"); spIn->doStandby_l(); } @@ -451,7 +451,7 @@ status_t AudioHardware::setMode(int mode) status_t AudioHardware::setMicMute(bool state) { - LOGV("setMicMute(%d) mMicMute %d", state, mMicMute); + ALOGV("setMicMute(%d) mMicMute %d", state, mMicMute); sp<AudioStreamInALSA> spIn; { AutoMutex lock(mLock); @@ -518,7 +518,7 @@ status_t AudioHardware::setParameters(const String8& keyValuePairs) } if (ttyMode != mTTYMode) { - LOGV("new tty mode %d", ttyMode); + ALOGV("new tty mode %d", ttyMode); mTTYMode = ttyMode; if (mOutput != 0 && mMode == AudioSystem::MODE_IN_CALL) { setIncallPath_l(mOutput->device()); @@ -535,7 +535,7 @@ String8 AudioHardware::getParameters(const String8& keys) AudioParameter request = AudioParameter(keys); AudioParameter reply = AudioParameter(); - LOGV("getParameters() %s", keys.string()); + ALOGV("getParameters() %s", keys.string()); return reply.toString(); } @@ -621,7 +621,7 @@ void AudioHardware::setVoiceVolume_l(float volume) status_t AudioHardware::setMasterVolume(float volume) { - LOGV("Set master volume to %f.\n", volume); + ALOGV("Set master volume to %f.\n", volume); // We return an error code here to let the audioflinger do in-software // volume on top of the maximum volume that we set through the SND API. // return error - software mixer will handle it @@ -704,7 +704,7 @@ status_t AudioHardware::dump(int fd, const Vector<String16>& args) status_t AudioHardware::setIncallPath_l(uint32_t device) { - LOGV("setIncallPath_l: device %x", device); + ALOGV("setIncallPath_l: device %x", device); // Setup sound path for CP clocking if ((mSecRilLibHandle) && @@ -757,7 +757,7 @@ status_t AudioHardware::setIncallPath_l(uint32_t device) TRACE_DRIVER_OUT LOGE_IF(ctl == NULL, "setIncallPath_l() could not get mixer ctl"); if (ctl != NULL) { - LOGV("setIncallPath_l() Voice Call Path, (%x)", device); + ALOGV("setIncallPath_l() Voice Call Path, (%x)", device); TRACE_DRIVER_IN(DRV_MIXER_SEL) mixer_ctl_set_enum_by_string(ctl, getVoiceRouteFromDevice(device)); TRACE_DRIVER_OUT @@ -823,7 +823,7 @@ void AudioHardware::closePcmOut_l() struct mixer *AudioHardware::openMixer_l() { - LOGV("openMixer_l() mMixerOpenCnt: %d", mMixerOpenCnt); + ALOGV("openMixer_l() mMixerOpenCnt: %d", mMixerOpenCnt); if (mMixerOpenCnt++ == 0) { if (mMixer != NULL) { LOGE("openMixer_l() mMixerOpenCnt == 0 and mMixer == %p\n", mMixer); @@ -844,7 +844,7 @@ struct mixer *AudioHardware::openMixer_l() void AudioHardware::closeMixer_l() { - LOGV("closeMixer_l() mMixerOpenCnt: %d", mMixerOpenCnt); + ALOGV("closeMixer_l() mMixerOpenCnt: %d", mMixerOpenCnt); if (mMixerOpenCnt == 0) { LOGE("closeMixer_l() mMixerOpenCnt == 0"); return; @@ -970,7 +970,7 @@ sp <AudioHardware::AudioStreamInALSA> AudioHardware::getActiveInput_l() status_t AudioHardware::setInputSource_l(audio_source source) { - LOGV("setInputSource_l(%d)", source); + ALOGV("setInputSource_l(%d)", source); if (source != mInputSource) { if ((source == AUDIO_SOURCE_DEFAULT) || (mMode != AudioSystem::MODE_IN_CALL)) { if (mMixer) { @@ -999,7 +999,7 @@ status_t AudioHardware::setInputSource_l(audio_source source) default: return NO_INIT; } - LOGV("mixer_ctl_set_enum_by_string, Input Source, (%s)", sourceName); + ALOGV("mixer_ctl_set_enum_by_string, Input Source, (%s)", sourceName); TRACE_DRIVER_IN(DRV_MIXER_SEL) mixer_ctl_set_enum_by_string(ctl, sourceName); TRACE_DRIVER_OUT @@ -1015,7 +1015,7 @@ struct echo_reference_itfe *AudioHardware::getEchoReference(audio_format_t forma uint32_t channelCount, uint32_t samplingRate) { - LOGV("AudioHardware::getEchoReference %p", mEchoReference); + ALOGV("AudioHardware::getEchoReference %p", mEchoReference); releaseEchoReference(mEchoReference); if (mOutput != NULL) { uint32_t wrChannelCount = popcount(mOutput->channels()); @@ -1037,7 +1037,7 @@ struct echo_reference_itfe *AudioHardware::getEchoReference(audio_format_t forma void AudioHardware::releaseEchoReference(struct echo_reference_itfe *reference) { - LOGV("AudioHardware::releaseEchoReference %p", mEchoReference); + ALOGV("AudioHardware::releaseEchoReference %p", mEchoReference); if (mEchoReference != NULL && reference == mEchoReference) { if (mOutput != NULL) { mOutput->removeEchoReference(reference); @@ -1112,7 +1112,7 @@ int AudioHardware::AudioStreamOutALSA::getPlaybackDelay(size_t frames, buffer->time_stamp.tv_sec = 0; buffer->time_stamp.tv_nsec = 0; buffer->delay_ns = 0; - LOGV("getPlaybackDelay(): pcm_get_htimestamp error, setting playbackTimestamp to 0"); + ALOGV("getPlaybackDelay(): pcm_get_htimestamp error, setting playbackTimestamp to 0"); return rc; } @@ -1123,7 +1123,7 @@ int AudioHardware::AudioStreamOutALSA::getPlaybackDelay(size_t frames, // sample being written. long delayNs = (long)(((int64_t)(kernelFr + frames)* 1000000000) /AUDIO_HW_OUT_SAMPLERATE); - LOGV("AudioStreamOutALSA::getPlaybackDelay delayNs: [%ld], "\ + ALOGV("AudioStreamOutALSA::getPlaybackDelay delayNs: [%ld], "\ "kernelFr:[%d], frames:[%d], buffSize:[%d], time_stamp:[%ld].[%ld]", delayNs, (int)kernelFr, (int)frames, pcm_get_buffer_size(mPcm), (long)buffer->time_stamp.tv_sec, buffer->time_stamp.tv_nsec); @@ -1135,7 +1135,7 @@ int AudioHardware::AudioStreamOutALSA::getPlaybackDelay(size_t frames, ssize_t AudioHardware::AudioStreamOutALSA::write(const void* buffer, size_t bytes) { - LOGV("-----AudioStreamInALSA::write(%p, %d) START", buffer, (int)bytes); + ALOGV("-----AudioStreamInALSA::write(%p, %d) START", buffer, (int)bytes); status_t status = NO_INIT; const uint8_t* p = static_cast<const uint8_t*>(buffer); int ret; @@ -1167,7 +1167,7 @@ ssize_t AudioHardware::AudioStreamOutALSA::write(const void* buffer, size_t byte // while the mutex is released if ((spIn == mHardware->getActiveInput_l()) && (cnt == spIn->standbyCnt())) { - LOGV("AudioStreamOutALSA::write() force input standby"); + ALOGV("AudioStreamOutALSA::write() force input standby"); spIn->close_l(); break; } @@ -1206,7 +1206,7 @@ ssize_t AudioHardware::AudioStreamOutALSA::write(const void* buffer, size_t byte TRACE_DRIVER_OUT if (ret == 0) { - LOGV("-----AudioStreamInALSA::write(%p, %d) END", buffer, (int)bytes); + ALOGV("-----AudioStreamInALSA::write(%p, %d) END", buffer, (int)bytes); return bytes; } LOGW("write error: %d", errno); @@ -1271,7 +1271,7 @@ void AudioHardware::AudioStreamOutALSA::close_l() status_t AudioHardware::AudioStreamOutALSA::open_l() { - LOGV("open pcm_out driver"); + ALOGV("open pcm_out driver"); mPcm = mHardware->openPcmOut_l(); if (mPcm == NULL) { return NO_INIT; @@ -1279,14 +1279,14 @@ status_t AudioHardware::AudioStreamOutALSA::open_l() mMixer = mHardware->openMixer_l(); if (mMixer) { - LOGV("open playback normal"); + ALOGV("open playback normal"); TRACE_DRIVER_IN(DRV_MIXER_GET) mRouteCtl = mixer_get_ctl_by_name(mMixer, "Playback Path"); TRACE_DRIVER_OUT } if (mHardware->mode() != AudioSystem::MODE_IN_CALL) { const char *route = mHardware->getOutputRouteFromDevice(mDevices); - LOGV("write() wakeup setting route %s", route); + ALOGV("write() wakeup setting route %s", route); if (mRouteCtl) { TRACE_DRIVER_IN(DRV_MIXER_SEL) mixer_ctl_set_enum_by_string(mRouteCtl, route); @@ -1391,7 +1391,7 @@ String8 AudioHardware::AudioStreamOutALSA::getParameters(const String8& keys) param.addInt(key, (int)mDevices); } - LOGV("AudioStreamOutALSA::getParameters() %s", param.toString().string()); + ALOGV("AudioStreamOutALSA::getParameters() %s", param.toString().string()); return param.toString(); } @@ -1421,7 +1421,7 @@ void AudioHardware::AudioStreamOutALSA::unlock() { void AudioHardware::AudioStreamOutALSA::addEchoReference(struct echo_reference_itfe *reference) { - LOGV("AudioStreamOutALSA::addEchoReference %p", mEchoReference); + ALOGV("AudioStreamOutALSA::addEchoReference %p", mEchoReference); if (mEchoReference == NULL) { mEchoReference = reference; } @@ -1429,7 +1429,7 @@ void AudioHardware::AudioStreamOutALSA::addEchoReference(struct echo_reference_i void AudioHardware::AudioStreamOutALSA::removeEchoReference(struct echo_reference_itfe *reference) { - LOGV("AudioStreamOutALSA::removeEchoReference %p", mEchoReference); + ALOGV("AudioStreamOutALSA::removeEchoReference %p", mEchoReference); if (mEchoReference == reference) { mEchoReference->write(mEchoReference, NULL); mEchoReference = NULL; @@ -1477,7 +1477,7 @@ status_t AudioHardware::AudioStreamInALSA::set( mHardware = hw; - LOGV("AudioStreamInALSA::set(%d, %d, %u)", *pFormat, *pChannels, *pRate); + ALOGV("AudioStreamInALSA::set(%d, %d, %u)", *pFormat, *pChannels, *pRate); mBufferSize = getBufferSize(*pRate, AudioSystem::popCount(*pChannels)); mDevices = devices; @@ -1564,7 +1564,7 @@ ssize_t AudioHardware::AudioStreamInALSA::processFrames(void* buffer, ssize_t fr mProcBufSize = (size_t)frames; mProcBuf = (int16_t *)realloc(mProcBuf, mProcBufSize * mChannelCount * sizeof(int16_t)); - LOGV("processFrames(): mProcBuf %p size extended to %d frames", + ALOGV("processFrames(): mProcBuf %p size extended to %d frames", mProcBuf, mProcBufSize); } ssize_t framesRd = readFrames(mProcBuf + mProcFramesIn * mChannelCount, @@ -1621,7 +1621,7 @@ int32_t AudioHardware::AudioStreamInALSA::updateEchoReference(size_t frames) struct echo_reference_buffer b; b.delay_ns = 0; - LOGV("updateEchoReference1 START, frames = [%d], mRefFramesIn = [%d], b.frame_count = [%d]", + ALOGV("updateEchoReference1 START, frames = [%d], mRefFramesIn = [%d], b.frame_count = [%d]", frames, mRefFramesIn, frames - mRefFramesIn); if (mRefFramesIn < frames) { if (mRefBufSize < frames) { @@ -1638,12 +1638,12 @@ int32_t AudioHardware::AudioStreamInALSA::updateEchoReference(size_t frames) if (mEchoReference->read(mEchoReference, &b) == NO_ERROR) { mRefFramesIn += b.frame_count; - LOGV("updateEchoReference2: mRefFramesIn:[%d], mRefBufSize:[%d], "\ + ALOGV("updateEchoReference2: mRefFramesIn:[%d], mRefBufSize:[%d], "\ "frames:[%d], b.frame_count:[%d]", mRefFramesIn, mRefBufSize,frames,b.frame_count); } }else{ - LOGV("updateEchoReference3: NOT enough frames to read ref buffer"); + ALOGV("updateEchoReference3: NOT enough frames to read ref buffer"); } return b.delay_ns; } @@ -1675,7 +1675,7 @@ void AudioHardware::AudioStreamInALSA::pushEchoReference(size_t frames) mRefFramesIn -= refBuf.frameCount; if (mRefFramesIn) { - LOGV("pushEchoReference5: shifting mRefBuf down by = %d frames", mRefFramesIn); + ALOGV("pushEchoReference5: shifting mRefBuf down by = %d frames", mRefFramesIn); memcpy(mRefBuf, mRefBuf + refBuf.frameCount * mChannelCount, mRefFramesIn * mChannelCount * sizeof(int16_t)); @@ -1693,7 +1693,7 @@ status_t AudioHardware::AudioStreamInALSA::setPreProcessorEchoDelay(effect_handl *(uint32_t *)param->data = AEC_PARAM_ECHO_DELAY; *((int32_t *)param->data + 1) = delayUs; - LOGV("setPreProcessorEchoDelay: %d us", delayUs); + ALOGV("setPreProcessorEchoDelay: %d us", delayUs); return setPreprocessorParam(handle, param); } @@ -1750,7 +1750,7 @@ void AudioHardware::AudioStreamInALSA::getCaptureDelay(size_t frames, buffer->time_stamp = tstamp; buffer->delay_ns = delayNs; - LOGV("AudioStreamInALSA::getCaptureDelay TimeStamp = [%ld].[%ld], delayCaptureNs: [%d],"\ + ALOGV("AudioStreamInALSA::getCaptureDelay TimeStamp = [%ld].[%ld], delayCaptureNs: [%d],"\ " kernelDelay:[%ld], bufDelay:[%ld], rsmpDelay:[%ld], kernelFr:[%d], "\ "mInputFramesIn:[%d], mProcFramesIn:[%d], frames:[%d]", buffer->time_stamp.tv_sec , buffer->time_stamp.tv_nsec, buffer->delay_ns, @@ -1760,7 +1760,7 @@ void AudioHardware::AudioStreamInALSA::getCaptureDelay(size_t frames, ssize_t AudioHardware::AudioStreamInALSA::read(void* buffer, ssize_t bytes) { - LOGV("-----AudioStreamInALSA::read(%p, %d) START", buffer, (int)bytes); + ALOGV("-----AudioStreamInALSA::read(%p, %d) START", buffer, (int)bytes); status_t status = NO_INIT; if (mHardware == NULL) return NO_INIT; @@ -1798,13 +1798,13 @@ ssize_t AudioHardware::AudioStreamInALSA::read(void* buffer, ssize_t bytes) // open output before input if (spOut != 0) { if (!spOut->checkStandby()) { - LOGV("AudioStreamInALSA::read() force output standby"); + ALOGV("AudioStreamInALSA::read() force output standby"); spOut->close_l(); if (spOut->open_l() != NO_ERROR) { spOut->doStandby_l(); } } - LOGV("AudioStreamInALSA exit standby mNeedEchoReference %d mEchoReference %p", + ALOGV("AudioStreamInALSA exit standby mNeedEchoReference %d mEchoReference %p", mNeedEchoReference, mEchoReference); if (mNeedEchoReference && mEchoReference == NULL) { mEchoReference = mHardware->getEchoReference(AUDIO_FORMAT_PCM_16_BIT, @@ -1832,7 +1832,7 @@ ssize_t AudioHardware::AudioStreamInALSA::read(void* buffer, ssize_t bytes) } if (framesRd >= 0) { - LOGV("-----AudioStreamInALSA::read(%p, %d) END", buffer, (int)bytes); + ALOGV("-----AudioStreamInALSA::read(%p, %d) END", buffer, (int)bytes); return framesRd * mChannelCount * sizeof(int16_t); } @@ -1935,7 +1935,7 @@ status_t AudioHardware::AudioStreamInALSA::open_l() silence_threshold : 0, }; - LOGV("open pcm_in driver"); + ALOGV("open pcm_in driver"); TRACE_DRIVER_IN(DRV_PCM_OPEN) mPcm = pcm_open(0, 0, flags, &config); TRACE_DRIVER_OUT @@ -1967,7 +1967,7 @@ status_t AudioHardware::AudioStreamInALSA::open_l() if (mHardware->mode() != AudioSystem::MODE_IN_CALL) { const char *route = mHardware->getInputRouteFromDevice(mDevices); - LOGV("read() wakeup setting route %s", route); + ALOGV("read() wakeup setting route %s", route); if (mRouteCtl) { TRACE_DRIVER_IN(DRV_MIXER_SEL) mixer_ctl_set_enum_by_string(mRouteCtl, route); @@ -2079,25 +2079,25 @@ String8 AudioHardware::AudioStreamInALSA::getParameters(const String8& keys) param.addInt(key, (int)mDevices); } - LOGV("AudioStreamInALSA::getParameters() %s", param.toString().string()); + ALOGV("AudioStreamInALSA::getParameters() %s", param.toString().string()); return param.toString(); } status_t AudioHardware::AudioStreamInALSA::addAudioEffect(effect_handle_t effect) { - LOGV("AudioStreamInALSA::addAudioEffect() %p", effect); + ALOGV("AudioStreamInALSA::addAudioEffect() %p", effect); effect_descriptor_t desc; status_t status = (*effect)->get_descriptor(effect, &desc); if (status == 0) { if (memcmp(&desc.type, FX_IID_AEC, sizeof(effect_uuid_t)) == 0) { - LOGV("AudioStreamInALSA::addAudioEffect() mNeedEchoReference true"); + ALOGV("AudioStreamInALSA::addAudioEffect() mNeedEchoReference true"); mNeedEchoReference = true; standby(); } - LOGV("AudioStreamInALSA::addAudioEffect() name %s", desc.name); + ALOGV("AudioStreamInALSA::addAudioEffect() name %s", desc.name); } else { - LOGV("AudioStreamInALSA::addAudioEffect() get_descriptor() error"); + ALOGV("AudioStreamInALSA::addAudioEffect() get_descriptor() error"); } AutoMutex lock(mLock); @@ -2108,7 +2108,7 @@ status_t AudioHardware::AudioStreamInALSA::addAudioEffect(effect_handle_t effect status_t AudioHardware::AudioStreamInALSA::removeAudioEffect(effect_handle_t effect) { status_t status = INVALID_OPERATION; - LOGV("AudioStreamInALSA::removeAudioEffect() %p", effect); + ALOGV("AudioStreamInALSA::removeAudioEffect() %p", effect); { AutoMutex lock(mLock); for (size_t i = 0; i < mPreprocessors.size(); i++) { @@ -2124,7 +2124,7 @@ status_t AudioHardware::AudioStreamInALSA::removeAudioEffect(effect_handle_t eff effect_descriptor_t desc; if ((*effect)->get_descriptor(effect, &desc) == 0) { if (memcmp(&desc.type, FX_IID_AEC, sizeof(effect_uuid_t)) == 0) { - LOGV("AudioStreamInALSA::removeAudioEffect() mNeedEchoReference false"); + ALOGV("AudioStreamInALSA::removeAudioEffect() mNeedEchoReference false"); mNeedEchoReference = false; standby(); } diff --git a/libcamera/SecCamera.cpp b/libcamera/SecCamera.cpp index 9c2d023..cd4d3b2 100755 --- a/libcamera/SecCamera.cpp +++ b/libcamera/SecCamera.cpp @@ -304,7 +304,7 @@ static int fimc_v4l2_enum_fmt(int fp, unsigned int fmt) while (ioctl(fp, VIDIOC_ENUM_FMT, &fmtdesc) == 0) { if (fmtdesc.pixelformat == fmt) { - LOGV("passed fmt = %#x found pixel format[%d]: %s\n", fmt, fmtdesc.index, fmtdesc.description); + ALOGV("passed fmt = %#x found pixel format[%d]: %s\n", fmt, fmtdesc.index, fmtdesc.description); found = 1; break; } @@ -388,7 +388,7 @@ static int fimc_v4l2_streamoff(int fp) enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE; int ret; - LOGV("%s :", __func__); + ALOGV("%s :", __func__); ret = ioctl(fp, VIDIOC_STREAMOFF, &type); if (ret < 0) { LOGE("ERR(%s):VIDIOC_STREAMOFF failed\n", __func__); @@ -501,7 +501,7 @@ static int fimc_v4l2_g_parm(int fp, struct v4l2_streamparm *streamparm) return -1; } - LOGV("%s : timeperframe: numerator %d, denominator %d\n", __func__, + ALOGV("%s : timeperframe: numerator %d, denominator %d\n", __func__, streamparm->parm.capture.timeperframe.numerator, streamparm->parm.capture.timeperframe.denominator); @@ -592,17 +592,17 @@ SecCamera::SecCamera() : memset(&m_capture_buf, 0, sizeof(m_capture_buf)); - LOGV("%s :", __func__); + ALOGV("%s :", __func__); } SecCamera::~SecCamera() { - LOGV("%s :", __func__); + ALOGV("%s :", __func__); } int SecCamera::initCamera(int index) { - LOGV("%s :", __func__); + ALOGV("%s :", __func__); int ret = 0; if (!m_flag_init) { @@ -617,7 +617,7 @@ int SecCamera::initCamera(int index) LOGE("ERR(%s):Cannot open %s (error : %s)\n", __func__, CAMERA_DEV_NAME, strerror(errno)); return -1; } - LOGV("%s: open(%s) --> m_cam_fd %d", __FUNCTION__, CAMERA_DEV_NAME, m_cam_fd); + ALOGV("%s: open(%s) --> m_cam_fd %d", __FUNCTION__, CAMERA_DEV_NAME, m_cam_fd); LOGE("initCamera: m_cam_fd(%d), m_jpeg_fd(%d)", m_cam_fd, m_jpeg_fd); @@ -629,7 +629,7 @@ int SecCamera::initCamera(int index) CHECK(ret); m_cam_fd2 = open(CAMERA_DEV_NAME2, O_RDWR); - LOGV("%s: open(%s) --> m_cam_fd2 = %d", __FUNCTION__, CAMERA_DEV_NAME2, m_cam_fd2); + ALOGV("%s: open(%s) --> m_cam_fd2 = %d", __FUNCTION__, CAMERA_DEV_NAME2, m_cam_fd2); if (m_cam_fd2 < 0) { LOGE("ERR(%s):Cannot open %s (error : %s)\n", __func__, CAMERA_DEV_NAME2, strerror(errno)); return -1; @@ -672,14 +672,14 @@ int SecCamera::initCamera(int index) void SecCamera::resetCamera() { - LOGV("%s :", __func__); + ALOGV("%s :", __func__); DeinitCamera(); initCamera(m_camera_id); } void SecCamera::DeinitCamera() { - LOGV("%s :", __func__); + ALOGV("%s :", __func__); if (m_flag_init) { @@ -719,7 +719,7 @@ int SecCamera::startPreview(void) v4l2_streamparm streamparm; struct sec_cam_parm *parms; parms = (struct sec_cam_parm*)&streamparm.parm.raw_data; - LOGV("%s :", __func__); + ALOGV("%s :", __func__); // aleady started if (m_flag_camera_start > 0) { @@ -745,7 +745,7 @@ int SecCamera::startPreview(void) ret = fimc_v4l2_reqbufs(m_cam_fd, V4L2_BUF_TYPE_VIDEO_CAPTURE, MAX_BUFFERS); CHECK(ret); - LOGV("%s : m_preview_width: %d m_preview_height: %d m_angle: %d\n", + ALOGV("%s : m_preview_width: %d m_preview_height: %d m_angle: %d\n", __func__, m_preview_width, m_preview_height, m_angle); ret = fimc_v4l2_s_ctrl(m_cam_fd, @@ -774,7 +774,7 @@ int SecCamera::startPreview(void) if (m_camera_id == CAMERA_ID_FRONT) { /* Blur setting */ - LOGV("m_blur_level = %d", m_blur_level); + ALOGV("m_blur_level = %d", m_blur_level); ret = fimc_v4l2_s_ctrl(m_cam_fd, V4L2_CID_CAMERA_VGA_BLUR, m_blur_level); CHECK(ret); @@ -786,7 +786,7 @@ int SecCamera::startPreview(void) ret = fimc_v4l2_s_ctrl(m_cam_fd, V4L2_CID_CAMERA_RETURN_FOCUS, 0); CHECK(ret); - LOGV("%s: got the first frame of the preview\n", __func__); + ALOGV("%s: got the first frame of the preview\n", __func__); return 0; } @@ -795,7 +795,7 @@ int SecCamera::stopPreview(void) { int ret; - LOGV("%s :", __func__); + ALOGV("%s :", __func__); if (m_flag_camera_start == 0) { LOGW("%s: doing nothing because m_flag_camera_start is zero", __func__); @@ -823,7 +823,7 @@ int SecCamera::startRecord(void) { int ret, i; - LOGV("%s :", __func__); + ALOGV("%s :", __func__); // aleady started if (m_flag_record_start > 0) { @@ -879,7 +879,7 @@ int SecCamera::stopRecord(void) { int ret; - LOGV("%s :", __func__); + ALOGV("%s :", __func__); if (m_flag_record_start == 0) { LOGW("%s: doing nothing because m_flag_record_start is zero", __func__); @@ -1014,27 +1014,27 @@ int SecCamera::releaseRecordFrame(int index) int SecCamera::setPreviewSize(int width, int height, int pixel_format) { - LOGV("%s(width(%d), height(%d), format(%d))", __func__, width, height, pixel_format); + ALOGV("%s(width(%d), height(%d), format(%d))", __func__, width, height, pixel_format); int v4lpixelformat = pixel_format; #if defined(LOG_NDEBUG) && LOG_NDEBUG == 0 if (v4lpixelformat == V4L2_PIX_FMT_YUV420) - LOGV("PreviewFormat:V4L2_PIX_FMT_YUV420"); + ALOGV("PreviewFormat:V4L2_PIX_FMT_YUV420"); else if (v4lpixelformat == V4L2_PIX_FMT_NV12) - LOGV("PreviewFormat:V4L2_PIX_FMT_NV12"); + ALOGV("PreviewFormat:V4L2_PIX_FMT_NV12"); else if (v4lpixelformat == V4L2_PIX_FMT_NV12T) - LOGV("PreviewFormat:V4L2_PIX_FMT_NV12T"); + ALOGV("PreviewFormat:V4L2_PIX_FMT_NV12T"); else if (v4lpixelformat == V4L2_PIX_FMT_NV21) - LOGV("PreviewFormat:V4L2_PIX_FMT_NV21"); + ALOGV("PreviewFormat:V4L2_PIX_FMT_NV21"); else if (v4lpixelformat == V4L2_PIX_FMT_YUV422P) - LOGV("PreviewFormat:V4L2_PIX_FMT_YUV422P"); + ALOGV("PreviewFormat:V4L2_PIX_FMT_YUV422P"); else if (v4lpixelformat == V4L2_PIX_FMT_YUYV) - LOGV("PreviewFormat:V4L2_PIX_FMT_YUYV"); + ALOGV("PreviewFormat:V4L2_PIX_FMT_YUYV"); else if (v4lpixelformat == V4L2_PIX_FMT_RGB565) - LOGV("PreviewFormat:V4L2_PIX_FMT_RGB565"); + ALOGV("PreviewFormat:V4L2_PIX_FMT_RGB565"); else - LOGV("PreviewFormat:UnknownFormat"); + ALOGV("PreviewFormat:UnknownFormat"); #endif m_preview_width = width; m_preview_height = height; @@ -1074,7 +1074,7 @@ int SecCamera::getPreviewPixelFormat(void) */ int SecCamera::setSnapshotCmd(void) { - LOGV("%s :", __func__); + ALOGV("%s :", __func__); int ret = 0; @@ -1139,7 +1139,7 @@ int SecCamera::endSnapshot(void) */ unsigned char* SecCamera::getJpeg(int *jpeg_size, unsigned int *phyaddr) { - LOGV("%s :", __func__); + ALOGV("%s :", __func__); int index, ret = 0; unsigned char *addr; @@ -1165,7 +1165,7 @@ unsigned char* SecCamera::getJpeg(int *jpeg_size, unsigned int *phyaddr) ret = fimc_v4l2_s_ctrl(m_cam_fd, V4L2_CID_STREAM_PAUSE, 0); CHECK_PTR(ret); - LOGV("\nsnapshot dqueued buffer = %d snapshot_width = %d snapshot_height = %d, size = %d\n\n", + ALOGV("\nsnapshot dqueued buffer = %d snapshot_width = %d snapshot_height = %d, size = %d\n\n", index, m_snapshot_width, m_snapshot_height, *jpeg_size); addr = (unsigned char*)(m_capture_buf.start) + main_offset; @@ -1183,7 +1183,7 @@ int SecCamera::getExif(unsigned char *pExifDst, unsigned char *pThumbSrc) { JpegEncoder jpgEnc; - LOGV("%s : m_jpeg_thumbnail_width = %d, height = %d", + ALOGV("%s : m_jpeg_thumbnail_width = %d, height = %d", __func__, m_jpeg_thumbnail_width, m_jpeg_thumbnail_height); if ((m_jpeg_thumbnail_width > 0) && (m_jpeg_thumbnail_height > 0)) { int inFormat = JPG_MODESEL_YCBCR; @@ -1228,10 +1228,10 @@ int SecCamera::getExif(unsigned char *pExifDst, unsigned char *pThumbSrc) jpgEnc.encode(&thumbSize, NULL); - LOGV("%s : enableThumb set to true", __func__); + ALOGV("%s : enableThumb set to true", __func__); mExifInfo.enableThumb = true; } else { - LOGV("%s : enableThumb set to false", __func__); + ALOGV("%s : enableThumb set to false", __func__); mExifInfo.enableThumb = false; } @@ -1239,7 +1239,7 @@ int SecCamera::getExif(unsigned char *pExifDst, unsigned char *pThumbSrc) setExifChangedAttribute(); - LOGV("%s: calling jpgEnc.makeExif, mExifInfo.width set to %d, height to %d\n", + ALOGV("%s: calling jpgEnc.makeExif, mExifInfo.width set to %d, height to %d\n", __func__, mExifInfo.width, mExifInfo.height); jpgEnc.makeExif(pExifDst, &mExifInfo, &exifSize, true); @@ -1258,7 +1258,7 @@ void SecCamera::getPostViewConfig(int *width, int *height, int *size) *height = BACK_CAMERA_POSTVIEW_HEIGHT; *size = BACK_CAMERA_POSTVIEW_WIDTH * BACK_CAMERA_POSTVIEW_HEIGHT * BACK_CAMERA_POSTVIEW_BPP / 8; } - LOGV("[5B] m_preview_width : %d, mPostViewWidth = %d mPostViewHeight = %d mPostViewSize = %d", + ALOGV("[5B] m_preview_width : %d, mPostViewWidth = %d mPostViewHeight = %d mPostViewSize = %d", m_preview_width, *width, *height, *size); } @@ -1285,7 +1285,7 @@ int SecCamera::getPostViewOffset(void) int SecCamera::getSnapshotAndJpeg(unsigned char *yuv_buf, unsigned char *jpeg_buf, unsigned int *output_size) { - LOGV("%s :", __func__); + ALOGV("%s :", __func__); int index; //unsigned int addr; @@ -1319,23 +1319,23 @@ int SecCamera::getSnapshotAndJpeg(unsigned char *yuv_buf, unsigned char *jpeg_bu #if defined(LOG_NDEBUG) && LOG_NDEBUG == 0 if (m_snapshot_v4lformat == V4L2_PIX_FMT_YUV420) - LOGV("SnapshotFormat:V4L2_PIX_FMT_YUV420"); + ALOGV("SnapshotFormat:V4L2_PIX_FMT_YUV420"); else if (m_snapshot_v4lformat == V4L2_PIX_FMT_NV12) - LOGV("SnapshotFormat:V4L2_PIX_FMT_NV12"); + ALOGV("SnapshotFormat:V4L2_PIX_FMT_NV12"); else if (m_snapshot_v4lformat == V4L2_PIX_FMT_NV12T) - LOGV("SnapshotFormat:V4L2_PIX_FMT_NV12T"); + ALOGV("SnapshotFormat:V4L2_PIX_FMT_NV12T"); else if (m_snapshot_v4lformat == V4L2_PIX_FMT_NV21) - LOGV("SnapshotFormat:V4L2_PIX_FMT_NV21"); + ALOGV("SnapshotFormat:V4L2_PIX_FMT_NV21"); else if (m_snapshot_v4lformat == V4L2_PIX_FMT_YUV422P) - LOGV("SnapshotFormat:V4L2_PIX_FMT_YUV422P"); + ALOGV("SnapshotFormat:V4L2_PIX_FMT_YUV422P"); else if (m_snapshot_v4lformat == V4L2_PIX_FMT_YUYV) - LOGV("SnapshotFormat:V4L2_PIX_FMT_YUYV"); + ALOGV("SnapshotFormat:V4L2_PIX_FMT_YUYV"); else if (m_snapshot_v4lformat == V4L2_PIX_FMT_UYVY) - LOGV("SnapshotFormat:V4L2_PIX_FMT_UYVY"); + ALOGV("SnapshotFormat:V4L2_PIX_FMT_UYVY"); else if (m_snapshot_v4lformat == V4L2_PIX_FMT_RGB565) - LOGV("SnapshotFormat:V4L2_PIX_FMT_RGB565"); + ALOGV("SnapshotFormat:V4L2_PIX_FMT_RGB565"); else - LOGV("SnapshotFormat:UnknownFormat"); + ALOGV("SnapshotFormat:UnknownFormat"); #endif LOG_TIME_START(1) // prepare @@ -1361,7 +1361,7 @@ int SecCamera::getSnapshotAndJpeg(unsigned char *yuv_buf, unsigned char *jpeg_bu fimc_poll(&m_events_c); index = fimc_v4l2_dqbuf(m_cam_fd); fimc_v4l2_s_ctrl(m_cam_fd, V4L2_CID_STREAM_PAUSE, 0); - LOGV("\nsnapshot dequeued buffer = %d snapshot_width = %d snapshot_height = %d\n\n", + ALOGV("\nsnapshot dequeued buffer = %d snapshot_width = %d snapshot_height = %d\n\n", index, m_snapshot_width, m_snapshot_height); LOG_TIME_END(2) @@ -1447,7 +1447,7 @@ int SecCamera::getSnapshotAndJpeg(unsigned char *yuv_buf, unsigned char *jpeg_bu int SecCamera::setSnapshotSize(int width, int height) { - LOGV("%s(width(%d), height(%d))", __func__, width, height); + ALOGV("%s(width(%d), height(%d))", __func__, width, height); m_snapshot_width = width; m_snapshot_height = height; @@ -1542,7 +1542,7 @@ int SecCamera::getCameraId(void) int SecCamera::setAutofocus(void) { - LOGV("%s :", __func__); + ALOGV("%s :", __func__); if (m_cam_fd <= 0) { LOGE("ERR(%s):Camera was closed\n", __func__); @@ -1568,7 +1568,7 @@ int SecCamera::getAutoFocusResult(void) usleep(AF_DELAY); } if ((count >= FIRST_AF_SEARCH_COUNT) || (ret != AF_SUCCESS)) { - LOGV("%s : 1st AF timed out, failed, or was canceled", __func__); + ALOGV("%s : 1st AF timed out, failed, or was canceled", __func__); af_result = 0; goto finish_auto_focus; } @@ -1581,13 +1581,13 @@ int SecCamera::getAutoFocusResult(void) usleep(AF_DELAY); } if (count >= SECOND_AF_SEARCH_COUNT) { - LOGV("%s : 2nd AF timed out, failed, or was canceled", __func__); + ALOGV("%s : 2nd AF timed out, failed, or was canceled", __func__); af_result = 0; goto finish_auto_focus; } af_result = 1; - LOGV("%s : AF was successful, returning %d", __func__, af_result); + ALOGV("%s : AF was successful, returning %d", __func__, af_result); finish_auto_focus: if (fimc_v4l2_s_ctrl(m_cam_fd, V4L2_CID_CAMERA_FINISH_AUTO_FOCUS, 0) < 0) { @@ -1599,7 +1599,7 @@ finish_auto_focus: int SecCamera::cancelAutofocus(void) { - LOGV("%s :", __func__); + ALOGV("%s :", __func__); if (m_cam_fd <= 0) { LOGE("ERR(%s):Camera was closed\n", __func__); @@ -1618,13 +1618,13 @@ int SecCamera::cancelAutofocus(void) int SecCamera::zoomIn(void) { - LOGV("%s :", __func__); + ALOGV("%s :", __func__); return 0; } int SecCamera::zoomOut(void) { - LOGV("%s :", __func__); + ALOGV("%s :", __func__); return 0; } @@ -1675,13 +1675,13 @@ int SecCamera::SetRotate(int angle) int SecCamera::getRotate(void) { - LOGV("%s : angle(%d)", __func__, m_angle); + ALOGV("%s : angle(%d)", __func__, m_angle); return m_angle; } int SecCamera::setFrameRate(int frame_rate) { - LOGV("%s(FrameRate(%d))", __func__, frame_rate); + ALOGV("%s(FrameRate(%d))", __func__, frame_rate); if (frame_rate < FRAME_RATE_AUTO || FRAME_RATE_MAX < frame_rate ) LOGE("ERR(%s):Invalid frame_rate(%d)", __func__, frame_rate); @@ -1703,7 +1703,7 @@ int SecCamera::setFrameRate(int frame_rate) int SecCamera::setVerticalMirror(void) { - LOGV("%s :", __func__); + ALOGV("%s :", __func__); if (m_cam_fd <= 0) { LOGE("ERR(%s):Camera was closed\n", __func__); @@ -1720,7 +1720,7 @@ int SecCamera::setVerticalMirror(void) int SecCamera::setHorizontalMirror(void) { - LOGV("%s :", __func__); + ALOGV("%s :", __func__); if (m_cam_fd <= 0) { LOGE("ERR(%s):Camera was closed\n", __func__); @@ -1739,7 +1739,7 @@ int SecCamera::setHorizontalMirror(void) int SecCamera::setWhiteBalance(int white_balance) { - LOGV("%s(white_balance(%d))", __func__, white_balance); + ALOGV("%s(white_balance(%d))", __func__, white_balance); if (white_balance <= WHITE_BALANCE_BASE || WHITE_BALANCE_MAX <= white_balance) { LOGE("ERR(%s):Invalid white_balance(%d)", __func__, white_balance); @@ -1761,7 +1761,7 @@ int SecCamera::setWhiteBalance(int white_balance) int SecCamera::getWhiteBalance(void) { - LOGV("%s : white_balance(%d)", __func__, m_params->white_balance); + ALOGV("%s : white_balance(%d)", __func__, m_params->white_balance); return m_params->white_balance; } @@ -1769,7 +1769,7 @@ int SecCamera::getWhiteBalance(void) int SecCamera::setBrightness(int brightness) { - LOGV("%s(brightness(%d))", __func__, brightness); + ALOGV("%s(brightness(%d))", __func__, brightness); brightness += EV_DEFAULT; @@ -1793,7 +1793,7 @@ int SecCamera::setBrightness(int brightness) int SecCamera::getBrightness(void) { - LOGV("%s : brightness(%d)", __func__, m_params->brightness); + ALOGV("%s : brightness(%d)", __func__, m_params->brightness); return m_params->brightness; } @@ -1801,7 +1801,7 @@ int SecCamera::getBrightness(void) int SecCamera::setImageEffect(int image_effect) { - LOGV("%s(image_effect(%d))", __func__, image_effect); + ALOGV("%s(image_effect(%d))", __func__, image_effect); if (image_effect <= IMAGE_EFFECT_BASE || IMAGE_EFFECT_MAX <= image_effect) { LOGE("ERR(%s):Invalid image_effect(%d)", __func__, image_effect); @@ -1823,14 +1823,14 @@ int SecCamera::setImageEffect(int image_effect) int SecCamera::getImageEffect(void) { - LOGV("%s : image_effect(%d)", __func__, m_params->effects); + ALOGV("%s : image_effect(%d)", __func__, m_params->effects); return m_params->effects; } // ====================================================================== int SecCamera::setAntiBanding(int anti_banding) { - LOGV("%s(anti_banding(%d))", __func__, anti_banding); + ALOGV("%s(anti_banding(%d))", __func__, anti_banding); if (anti_banding < ANTI_BANDING_AUTO || ANTI_BANDING_OFF < anti_banding) { LOGE("ERR(%s):Invalid anti_banding (%d)", __func__, anti_banding); @@ -1853,7 +1853,7 @@ int SecCamera::setAntiBanding(int anti_banding) //====================================================================== int SecCamera::setSceneMode(int scene_mode) { - LOGV("%s(scene_mode(%d))", __func__, scene_mode); + ALOGV("%s(scene_mode(%d))", __func__, scene_mode); if (scene_mode <= SCENE_MODE_BASE || SCENE_MODE_MAX <= scene_mode) { LOGE("ERR(%s):Invalid scene_mode (%d)", __func__, scene_mode); @@ -1882,7 +1882,7 @@ int SecCamera::getSceneMode(void) int SecCamera::setFlashMode(int flash_mode) { - LOGV("%s(flash_mode(%d))", __func__, flash_mode); + ALOGV("%s(flash_mode(%d))", __func__, flash_mode); if (flash_mode <= FLASH_MODE_BASE || FLASH_MODE_MAX <= flash_mode) { LOGE("ERR(%s):Invalid flash_mode (%d)", __func__, flash_mode); @@ -1911,7 +1911,7 @@ int SecCamera::getFlashMode(void) int SecCamera::setISO(int iso_value) { - LOGV("%s(iso_value(%d))", __func__, iso_value); + ALOGV("%s(iso_value(%d))", __func__, iso_value); if (iso_value < ISO_AUTO || ISO_MAX <= iso_value) { LOGE("ERR(%s):Invalid iso_value (%d)", __func__, iso_value); return -1; @@ -1939,7 +1939,7 @@ int SecCamera::getISO(void) int SecCamera::setContrast(int contrast_value) { - LOGV("%s(contrast_value(%d))", __func__, contrast_value); + ALOGV("%s(contrast_value(%d))", __func__, contrast_value); if (contrast_value < CONTRAST_MINUS_2 || CONTRAST_MAX <= contrast_value) { LOGE("ERR(%s):Invalid contrast_value (%d)", __func__, contrast_value); @@ -1968,7 +1968,7 @@ int SecCamera::getContrast(void) int SecCamera::setSaturation(int saturation_value) { - LOGV("%s(saturation_value(%d))", __func__, saturation_value); + ALOGV("%s(saturation_value(%d))", __func__, saturation_value); if (saturation_value <SATURATION_MINUS_2 || SATURATION_MAX<= saturation_value) { LOGE("ERR(%s):Invalid saturation_value (%d)", __func__, saturation_value); @@ -1997,7 +1997,7 @@ int SecCamera::getSaturation(void) int SecCamera::setSharpness(int sharpness_value) { - LOGV("%s(sharpness_value(%d))", __func__, sharpness_value); + ALOGV("%s(sharpness_value(%d))", __func__, sharpness_value); if (sharpness_value < SHARPNESS_MINUS_2 || SHARPNESS_MAX <= sharpness_value) { LOGE("ERR(%s):Invalid sharpness_value (%d)", __func__, sharpness_value); @@ -2026,7 +2026,7 @@ int SecCamera::getSharpness(void) int SecCamera::setWDR(int wdr_value) { - LOGV("%s(wdr_value(%d))", __func__, wdr_value); + ALOGV("%s(wdr_value(%d))", __func__, wdr_value); if (wdr_value < WDR_OFF || WDR_MAX <= wdr_value) { LOGE("ERR(%s):Invalid wdr_value (%d)", __func__, wdr_value); @@ -2055,7 +2055,7 @@ int SecCamera::getWDR(void) int SecCamera::setAntiShake(int anti_shake) { - LOGV("%s(anti_shake(%d))", __func__, anti_shake); + ALOGV("%s(anti_shake(%d))", __func__, anti_shake); if (anti_shake < ANTI_SHAKE_OFF || ANTI_SHAKE_MAX <= anti_shake) { LOGE("ERR(%s):Invalid anti_shake (%d)", __func__, anti_shake); @@ -2085,7 +2085,7 @@ int SecCamera::getAntiShake(void) int SecCamera::setMetering(int metering_value) { - LOGV("%s(metering (%d))", __func__, metering_value); + ALOGV("%s(metering (%d))", __func__, metering_value); if (metering_value <= METERING_BASE || METERING_MAX <= metering_value) { LOGE("ERR(%s):Invalid metering_value (%d)", __func__, metering_value); @@ -2114,7 +2114,7 @@ int SecCamera::getMetering(void) int SecCamera::setJpegQuality(int jpeg_quality) { - LOGV("%s(jpeg_quality (%d))", __func__, jpeg_quality); + ALOGV("%s(jpeg_quality (%d))", __func__, jpeg_quality); if (jpeg_quality < JPEG_QUALITY_ECONOMY || JPEG_QUALITY_MAX <= jpeg_quality) { LOGE("ERR(%s):Invalid jpeg_quality (%d)", __func__, jpeg_quality); @@ -2143,7 +2143,7 @@ int SecCamera::getJpegQuality(void) int SecCamera::setZoom(int zoom_level) { - LOGV("%s(zoom_level (%d))", __func__, zoom_level); + ALOGV("%s(zoom_level (%d))", __func__, zoom_level); if (zoom_level < ZOOM_LEVEL_0 || ZOOM_LEVEL_MAX <= zoom_level) { LOGE("ERR(%s):Invalid zoom_level (%d)", __func__, zoom_level); @@ -2172,7 +2172,7 @@ int SecCamera::getZoom(void) int SecCamera::setObjectTracking(int object_tracking) { - LOGV("%s(object_tracking (%d))", __func__, object_tracking); + ALOGV("%s(object_tracking (%d))", __func__, object_tracking); if (object_tracking < OBJECT_TRACKING_OFF || OBJECT_TRACKING_MAX <= object_tracking) { LOGE("ERR(%s):Invalid object_tracking (%d)", __func__, object_tracking); @@ -2200,7 +2200,7 @@ int SecCamera::getObjectTrackingStatus(void) int SecCamera::setObjectTrackingStartStop(int start_stop) { - LOGV("%s(object_tracking_start_stop (%d))", __func__, start_stop); + ALOGV("%s(object_tracking_start_stop (%d))", __func__, start_stop); if (m_object_tracking_start_stop != start_stop) { m_object_tracking_start_stop = start_stop; @@ -2215,7 +2215,7 @@ int SecCamera::setObjectTrackingStartStop(int start_stop) int SecCamera::setTouchAFStartStop(int start_stop) { - LOGV("%s(touch_af_start_stop (%d))", __func__, start_stop); + ALOGV("%s(touch_af_start_stop (%d))", __func__, start_stop); if (m_touch_af_start_stop != start_stop) { m_touch_af_start_stop = start_stop; @@ -2232,7 +2232,7 @@ int SecCamera::setTouchAFStartStop(int start_stop) int SecCamera::setSmartAuto(int smart_auto) { - LOGV("%s(smart_auto (%d))", __func__, smart_auto); + ALOGV("%s(smart_auto (%d))", __func__, smart_auto); if (smart_auto < SMART_AUTO_OFF || SMART_AUTO_MAX <= smart_auto) { LOGE("ERR(%s):Invalid smart_auto (%d)", __func__, smart_auto); @@ -2269,14 +2269,14 @@ int SecCamera::getAutosceneStatus(void) return -1; } } - //LOGV("%s : autoscene_status (%d)", __func__, autoscene_status); + //ALOGV("%s : autoscene_status (%d)", __func__, autoscene_status); return autoscene_status; } //====================================================================== int SecCamera::setBeautyShot(int beauty_shot) { - LOGV("%s(beauty_shot (%d))", __func__, beauty_shot); + ALOGV("%s(beauty_shot (%d))", __func__, beauty_shot); if (beauty_shot < BEAUTY_SHOT_OFF || BEAUTY_SHOT_MAX <= beauty_shot) { LOGE("ERR(%s):Invalid beauty_shot (%d)", __func__, beauty_shot); @@ -2307,7 +2307,7 @@ int SecCamera::getBeautyShot(void) int SecCamera::setVintageMode(int vintage_mode) { - LOGV("%s(vintage_mode(%d))", __func__, vintage_mode); + ALOGV("%s(vintage_mode(%d))", __func__, vintage_mode); if (vintage_mode <= VINTAGE_MODE_BASE || VINTAGE_MODE_MAX <= vintage_mode) { LOGE("ERR(%s):Invalid vintage_mode (%d)", __func__, vintage_mode); @@ -2336,7 +2336,7 @@ int SecCamera::getVintageMode(void) int SecCamera::setFocusMode(int focus_mode) { - LOGV("%s(focus_mode(%d))", __func__, focus_mode); + ALOGV("%s(focus_mode(%d))", __func__, focus_mode); if (FOCUS_MODE_MAX <= focus_mode) { LOGE("ERR(%s):Invalid focus_mode (%d)", __func__, focus_mode); @@ -2366,7 +2366,7 @@ int SecCamera::getFocusMode(void) int SecCamera::setFaceDetect(int face_detect) { - LOGV("%s(face_detect(%d))", __func__, face_detect); + ALOGV("%s(face_detect(%d))", __func__, face_detect); if (m_face_detect != face_detect) { m_face_detect = face_detect; @@ -2396,7 +2396,7 @@ int SecCamera::getFaceDetect(void) int SecCamera::setGPSLatitude(const char *gps_latitude) { - LOGV("%s(gps_latitude(%s))", __func__, gps_latitude); + ALOGV("%s(gps_latitude(%s))", __func__, gps_latitude); if (gps_latitude == NULL) m_gps_enabled = false; else { @@ -2404,13 +2404,13 @@ int SecCamera::setGPSLatitude(const char *gps_latitude) m_gps_latitude = lround(strtod(gps_latitude, NULL) * 10000000); } - LOGV("%s(m_gps_latitude(%ld))", __func__, m_gps_latitude); + ALOGV("%s(m_gps_latitude(%ld))", __func__, m_gps_latitude); return 0; } int SecCamera::setGPSLongitude(const char *gps_longitude) { - LOGV("%s(gps_longitude(%s))", __func__, gps_longitude); + ALOGV("%s(gps_longitude(%s))", __func__, gps_longitude); if (gps_longitude == NULL) m_gps_enabled = false; else { @@ -2418,38 +2418,38 @@ int SecCamera::setGPSLongitude(const char *gps_longitude) m_gps_longitude = lround(strtod(gps_longitude, NULL) * 10000000); } - LOGV("%s(m_gps_longitude(%ld))", __func__, m_gps_longitude); + ALOGV("%s(m_gps_longitude(%ld))", __func__, m_gps_longitude); return 0; } int SecCamera::setGPSAltitude(const char *gps_altitude) { - LOGV("%s(gps_altitude(%s))", __func__, gps_altitude); + ALOGV("%s(gps_altitude(%s))", __func__, gps_altitude); if (gps_altitude == NULL) m_gps_altitude = 0; else { m_gps_altitude = lround(strtod(gps_altitude, NULL) * 100); } - LOGV("%s(m_gps_altitude(%ld))", __func__, m_gps_altitude); + ALOGV("%s(m_gps_altitude(%ld))", __func__, m_gps_altitude); return 0; } int SecCamera::setGPSTimeStamp(const char *gps_timestamp) { - LOGV("%s(gps_timestamp(%s))", __func__, gps_timestamp); + ALOGV("%s(gps_timestamp(%s))", __func__, gps_timestamp); if (gps_timestamp == NULL) m_gps_timestamp = 0; else m_gps_timestamp = atol(gps_timestamp); - LOGV("%s(m_gps_timestamp(%ld))", __func__, m_gps_timestamp); + ALOGV("%s(m_gps_timestamp(%ld))", __func__, m_gps_timestamp); return 0; } int SecCamera::setGPSProcessingMethod(const char *gps_processing_method) { - LOGV("%s(gps_processing_method(%s))", __func__, gps_processing_method); + ALOGV("%s(gps_processing_method(%s))", __func__, gps_processing_method); memset(mExifInfo.gps_processing_method, 0, sizeof(mExifInfo.gps_processing_method)); if (gps_processing_method != NULL) { size_t len = strlen(gps_processing_method); @@ -2463,7 +2463,7 @@ int SecCamera::setGPSProcessingMethod(const char *gps_processing_method) int SecCamera::setFaceDetectLockUnlock(int facedetect_lockunlock) { - LOGV("%s(facedetect_lockunlock(%d))", __func__, facedetect_lockunlock); + ALOGV("%s(facedetect_lockunlock(%d))", __func__, facedetect_lockunlock); if (fimc_v4l2_s_ctrl(m_cam_fd, V4L2_CID_CAMERA_FACEDETECT_LOCKUNLOCK, facedetect_lockunlock) < 0) { LOGE("ERR(%s):Fail on V4L2_CID_CAMERA_FACEDETECT_LOCKUNLOCK", __func__); @@ -2475,7 +2475,7 @@ int SecCamera::setFaceDetectLockUnlock(int facedetect_lockunlock) int SecCamera::setObjectPosition(int x, int y) { - LOGV("%s(setObjectPosition(x=%d, y=%d))", __func__, x, y); + ALOGV("%s(setObjectPosition(x=%d, y=%d))", __func__, x, y); if (m_preview_width ==640) x = x - 80; @@ -2497,7 +2497,7 @@ int SecCamera::setObjectPosition(int x, int y) int SecCamera::setGamma(int gamma) { - LOGV("%s(gamma(%d))", __func__, gamma); + ALOGV("%s(gamma(%d))", __func__, gamma); if (gamma < GAMMA_OFF || GAMMA_MAX <= gamma) { LOGE("ERR(%s):Invalid gamma (%d)", __func__, gamma); @@ -2521,7 +2521,7 @@ int SecCamera::setGamma(int gamma) int SecCamera::setSlowAE(int slow_ae) { - LOGV("%s(slow_ae(%d))", __func__, slow_ae); + ALOGV("%s(slow_ae(%d))", __func__, slow_ae); if (slow_ae < GAMMA_OFF || GAMMA_MAX <= slow_ae) { LOGE("ERR(%s):Invalid slow_ae (%d)", __func__, slow_ae); @@ -2544,7 +2544,7 @@ int SecCamera::setSlowAE(int slow_ae) //====================================================================== int SecCamera::setRecordingSize(int width, int height) { - LOGV("%s(width(%d), height(%d))", __func__, width, height); + ALOGV("%s(width(%d), height(%d))", __func__, width, height); m_recording_width = width; m_recording_height = height; @@ -2556,7 +2556,7 @@ int SecCamera::setRecordingSize(int width, int height) int SecCamera::setExifOrientationInfo(int orientationInfo) { - LOGV("%s(orientationInfo(%d))", __func__, orientationInfo); + ALOGV("%s(orientationInfo(%d))", __func__, orientationInfo); if (orientationInfo < 0) { LOGE("ERR(%s):Invalid orientationInfo (%d)", __func__, orientationInfo); @@ -2583,7 +2583,7 @@ int SecCamera::setBatchReflection() /*Video call*/ int SecCamera::setVTmode(int vtmode) { - LOGV("%s(vtmode (%d))", __func__, vtmode); + ALOGV("%s(vtmode (%d))", __func__, vtmode); if (vtmode < VT_MODE_OFF || VT_MODE_MAX <= vtmode) { LOGE("ERR(%s):Invalid vtmode (%d)", __func__, vtmode); @@ -2600,7 +2600,7 @@ int SecCamera::setVTmode(int vtmode) /* Camcorder fix fps */ int SecCamera::setSensorMode(int sensor_mode) { - LOGV("%s(sensor_mode (%d))", __func__, sensor_mode); + ALOGV("%s(sensor_mode (%d))", __func__, sensor_mode); if (sensor_mode < SENSOR_MODE_CAMERA || SENSOR_MODE_MOVIE < sensor_mode) { LOGE("ERR(%s):Invalid sensor mode (%d)", __func__, sensor_mode); @@ -2623,7 +2623,7 @@ int SecCamera::setSensorMode(int sensor_mode) */ int SecCamera::setShotMode(int shot_mode) { - LOGV("%s(shot_mode (%d))", __func__, shot_mode); + ALOGV("%s(shot_mode (%d))", __func__, shot_mode); if (shot_mode < SHOT_MODE_SINGLE || SHOT_MODE_SELF < shot_mode) { LOGE("ERR(%s):Invalid shot_mode (%d)", __func__, shot_mode); return -1; @@ -2640,7 +2640,7 @@ int SecCamera::getVTmode(void) int SecCamera::setBlur(int blur_level) { - LOGV("%s(level (%d))", __func__, blur_level); + ALOGV("%s(level (%d))", __func__, blur_level); if (blur_level < BLUR_LEVEL_0 || BLUR_LEVEL_MAX <= blur_level) { LOGE("ERR(%s):Invalid level (%d)", __func__, blur_level); @@ -2666,7 +2666,7 @@ int SecCamera::getBlur(void) int SecCamera::setDataLineCheck(int chk_dataline) { - LOGV("%s(chk_dataline (%d))", __func__, chk_dataline); + ALOGV("%s(chk_dataline (%d))", __func__, chk_dataline); if (chk_dataline < CHK_DATALINE_OFF || CHK_DATALINE_MAX <= chk_dataline) { LOGE("ERR(%s):Invalid chk_dataline (%d)", __func__, chk_dataline); @@ -2685,7 +2685,7 @@ int SecCamera::getDataLineCheck(void) int SecCamera::setDataLineCheckStop(void) { - LOGV("%s", __func__); + ALOGV("%s", __func__); if (m_flag_camera_start) { if (fimc_v4l2_s_ctrl(m_cam_fd, V4L2_CID_CAMERA_CHECK_DATALINE_STOP, 1) < 0) { @@ -2698,7 +2698,7 @@ int SecCamera::setDataLineCheckStop(void) const __u8* SecCamera::getCameraSensorName(void) { - LOGV("%s", __func__); + ALOGV("%s", __func__); return fimc_v4l2_enuminput(m_cam_fd, getCameraId()); } @@ -2706,7 +2706,7 @@ const __u8* SecCamera::getCameraSensorName(void) #ifdef ENABLE_ESD_PREVIEW_CHECK int SecCamera::getCameraSensorESDStatus(void) { - LOGV("%s", __func__); + ALOGV("%s", __func__); // 0 : normal operation, 1 : abnormal operation int status = fimc_v4l2_g_ctrl(m_cam_fd, V4L2_CID_ESD_INT); @@ -2720,7 +2720,7 @@ int SecCamera::getCameraSensorESDStatus(void) int SecCamera::setJpegThumbnailSize(int width, int height) { - LOGV("%s(width(%d), height(%d))", __func__, width, height); + ALOGV("%s(width(%d), height(%d))", __func__, width, height); m_jpeg_thumbnail_width = width; m_jpeg_thumbnail_height = height; diff --git a/libcamera/SecCameraHWInterface.cpp b/libcamera/SecCameraHWInterface.cpp index ca82669..f67951a 100755 --- a/libcamera/SecCameraHWInterface.cpp +++ b/libcamera/SecCameraHWInterface.cpp @@ -90,7 +90,7 @@ CameraHardwareSec::CameraHardwareSec(int cameraId, camera_device_t *dev) mPostViewSize(0), mHalDevice(dev) { - LOGV("%s :", __func__); + ALOGV("%s :", __func__); int ret = 0; mPreviewWindow = NULL; @@ -112,7 +112,7 @@ CameraHardwareSec::CameraHardwareSec(int cameraId, camera_device_t *dev) } mSecCamera->getPostViewConfig(&mPostViewWidth, &mPostViewHeight, &mPostViewSize); - LOGV("mPostViewWidth = %d mPostViewHeight = %d mPostViewSize = %d", + ALOGV("mPostViewWidth = %d mPostViewHeight = %d mPostViewSize = %d", mPostViewWidth,mPostViewHeight,mPostViewSize); initDefaultParameters(cameraId); @@ -145,7 +145,7 @@ void CameraHardwareSec::initDefaultParameters(int cameraId) CameraParameters ip; mCameraSensorName = mSecCamera->getCameraSensorName(); - LOGV("CameraSensorName: %s", mCameraSensorName); + ALOGV("CameraSensorName: %s", mCameraSensorName); int preview_max_width = 0; int preview_max_height = 0; @@ -357,7 +357,7 @@ void CameraHardwareSec::initDefaultParameters(int cameraId) CameraHardwareSec::~CameraHardwareSec() { - LOGV("%s", __func__); + ALOGV("%s", __func__); mSecCamera->DeinitCamera(); } @@ -366,7 +366,7 @@ status_t CameraHardwareSec::setPreviewWindow(preview_stream_ops *w) int min_bufs; mPreviewWindow = w; - LOGV("%s: mPreviewWindow %p", __func__, mPreviewWindow); + ALOGV("%s: mPreviewWindow %p", __func__, mPreviewWindow); if (!w) { LOGE("preview window is NULL!"); @@ -390,7 +390,7 @@ status_t CameraHardwareSec::setPreviewWindow(preview_stream_ops *w) min_bufs, kBufferCount - 1); } - LOGV("%s: setting buffer count to %d", __func__, kBufferCount); + ALOGV("%s: setting buffer count to %d", __func__, kBufferCount); if (w->set_buffer_count(w, kBufferCount)) { LOGE("%s: could not set buffer count", __func__); return INVALID_OPERATION; @@ -402,7 +402,7 @@ status_t CameraHardwareSec::setPreviewWindow(preview_stream_ops *w) int hal_pixel_format = HAL_PIXEL_FORMAT_YV12; const char *str_preview_format = mParameters.getPreviewFormat(); - LOGV("%s: preview format %s", __func__, str_preview_format); + ALOGV("%s: preview format %s", __func__, str_preview_format); if (w->set_usage(w, GRALLOC_USAGE_SW_WRITE_OFTEN)) { LOGE("%s: could not set usage on gralloc buffer", __func__); @@ -418,7 +418,7 @@ status_t CameraHardwareSec::setPreviewWindow(preview_stream_ops *w) } if (mPreviewRunning && mPreviewStartDeferred) { - LOGV("start/resume preview"); + ALOGV("start/resume preview"); status_t ret = startPreviewInternal(); if (ret == OK) { mPreviewStartDeferred = false; @@ -445,19 +445,19 @@ void CameraHardwareSec::setCallbacks(camera_notify_callback notify_cb, void CameraHardwareSec::enableMsgType(int32_t msgType) { - LOGV("%s : msgType = 0x%x, mMsgEnabled before = 0x%x", + ALOGV("%s : msgType = 0x%x, mMsgEnabled before = 0x%x", __func__, msgType, mMsgEnabled); mMsgEnabled |= msgType; - LOGV("%s : mMsgEnabled = 0x%x", __func__, mMsgEnabled); + ALOGV("%s : mMsgEnabled = 0x%x", __func__, mMsgEnabled); } void CameraHardwareSec::disableMsgType(int32_t msgType) { - LOGV("%s : msgType = 0x%x, mMsgEnabled before = 0x%x", + ALOGV("%s : msgType = 0x%x, mMsgEnabled before = 0x%x", __func__, msgType, mMsgEnabled); mMsgEnabled &= ~msgType; - LOGV("%s : mMsgEnabled = 0x%x", __func__, mMsgEnabled); + ALOGV("%s : mMsgEnabled = 0x%x", __func__, mMsgEnabled); } bool CameraHardwareSec::msgTypeEnabled(int32_t msgType) @@ -513,13 +513,13 @@ int CameraHardwareSec::previewThread() return UNKNOWN_ERROR; } -// LOGV("%s: index %d", __func__, index); +// ALOGV("%s: index %d", __func__, index); mSkipFrameLock.lock(); if (mSkipFrame > 0) { mSkipFrame--; mSkipFrameLock.unlock(); - LOGV("%s: index %d skipping frame", __func__, index); + ALOGV("%s: index %d skipping frame", __func__, index); return NO_ERROR; } mSkipFrameLock.unlock(); @@ -662,7 +662,7 @@ status_t CameraHardwareSec::startPreview() { int ret = 0; //s1 [Apply factory standard] - LOGV("%s :", __func__); + ALOGV("%s :", __func__); if (waitCaptureCompletion() != NO_ERROR) { return TIMED_OUT; @@ -696,10 +696,10 @@ status_t CameraHardwareSec::startPreview() status_t CameraHardwareSec::startPreviewInternal() { - LOGV("%s", __func__); + ALOGV("%s", __func__); int ret = mSecCamera->startPreview(); - LOGV("%s : mSecCamera->startPreview() returned %d", __func__, ret); + ALOGV("%s : mSecCamera->startPreview() returned %d", __func__, ret); if (ret < 0) { LOGE("ERR(%s):Fail on mSecCamera->startPreview()", __func__); @@ -725,7 +725,7 @@ status_t CameraHardwareSec::startPreviewInternal() 0); // no cookie mSecCamera->getPostViewConfig(&mPostViewWidth, &mPostViewHeight, &mPostViewSize); - LOGV("CameraHardwareSec: mPostViewWidth = %d mPostViewHeight = %d mPostViewSize = %d", + ALOGV("CameraHardwareSec: mPostViewWidth = %d mPostViewHeight = %d mPostViewSize = %d", mPostViewWidth,mPostViewHeight,mPostViewSize); return NO_ERROR; @@ -733,7 +733,7 @@ status_t CameraHardwareSec::startPreviewInternal() void CameraHardwareSec::stopPreviewInternal() { - LOGV("%s :", __func__); + ALOGV("%s :", __func__); /* request that the preview thread stop. */ if (mPreviewRunning) { @@ -744,14 +744,14 @@ void CameraHardwareSec::stopPreviewInternal() mPreviewStoppedCondition.wait(mPreviewLock); } else - LOGV("%s : preview running but deferred, doing nothing", __func__); + ALOGV("%s : preview running but deferred, doing nothing", __func__); } else LOGI("%s : preview not running, doing nothing", __func__); } void CameraHardwareSec::stopPreview() { - LOGV("%s :", __func__); + ALOGV("%s :", __func__); /* request that the preview thread stop. */ mPreviewLock.lock(); @@ -762,7 +762,7 @@ void CameraHardwareSec::stopPreview() bool CameraHardwareSec::previewEnabled() { Mutex::Autolock lock(mPreviewLock); - LOGV("%s : %d", __func__, mPreviewRunning); + ALOGV("%s : %d", __func__, mPreviewRunning); return mPreviewRunning; } @@ -770,7 +770,7 @@ bool CameraHardwareSec::previewEnabled() status_t CameraHardwareSec::startRecording() { - LOGV("%s :", __func__); + ALOGV("%s :", __func__); Mutex::Autolock lock(mRecordLock); @@ -796,7 +796,7 @@ status_t CameraHardwareSec::startRecording() void CameraHardwareSec::stopRecording() { - LOGV("%s :", __func__); + ALOGV("%s :", __func__); Mutex::Autolock lock(mRecordLock); @@ -811,7 +811,7 @@ void CameraHardwareSec::stopRecording() bool CameraHardwareSec::recordingEnabled() { - LOGV("%s :", __func__); + ALOGV("%s :", __func__); return mRecordRunning; } @@ -829,7 +829,7 @@ int CameraHardwareSec::autoFocusThread() int count =0; int af_status =0 ; - LOGV("%s : starting", __func__); + ALOGV("%s : starting", __func__); /* block until we're told to start. we don't want to use * a restartable thread and requestExitAndWait() in cancelAutoFocus() @@ -841,19 +841,19 @@ int CameraHardwareSec::autoFocusThread() /* check early exit request */ if (mExitAutoFocusThread) { mFocusLock.unlock(); - LOGV("%s : exiting on request0", __func__); + ALOGV("%s : exiting on request0", __func__); return NO_ERROR; } mFocusCondition.wait(mFocusLock); /* check early exit request */ if (mExitAutoFocusThread) { mFocusLock.unlock(); - LOGV("%s : exiting on request1", __func__); + ALOGV("%s : exiting on request1", __func__); return NO_ERROR; } mFocusLock.unlock(); - LOGV("%s : calling setAutoFocus", __func__); + ALOGV("%s : calling setAutoFocus", __func__); if (mSecCamera->setAutofocus() < 0) { LOGE("ERR(%s):Fail on mSecCamera->setAutofocus()", __func__); return UNKNOWN_ERROR; @@ -862,11 +862,11 @@ int CameraHardwareSec::autoFocusThread() af_status = mSecCamera->getAutoFocusResult(); if (af_status == 0x01) { - LOGV("%s : AF Success!!", __func__); + ALOGV("%s : AF Success!!", __func__); if (mMsgEnabled & CAMERA_MSG_FOCUS) mNotifyCb(CAMERA_MSG_FOCUS, true, 0, mCallbackCookie); } else if (af_status == 0x02) { - LOGV("%s : AF Cancelled !!", __func__); + ALOGV("%s : AF Cancelled !!", __func__); if (mMsgEnabled & CAMERA_MSG_FOCUS) { /* CAMERA_MSG_FOCUS only takes a bool. true for * finished and false for failure. cancel is still @@ -875,19 +875,19 @@ int CameraHardwareSec::autoFocusThread() mNotifyCb(CAMERA_MSG_FOCUS, true, 0, mCallbackCookie); } } else { - LOGV("%s : AF Fail !!", __func__); - LOGV("%s : mMsgEnabled = 0x%x", __func__, mMsgEnabled); + ALOGV("%s : AF Fail !!", __func__); + ALOGV("%s : mMsgEnabled = 0x%x", __func__, mMsgEnabled); if (mMsgEnabled & CAMERA_MSG_FOCUS) mNotifyCb(CAMERA_MSG_FOCUS, false, 0, mCallbackCookie); } - LOGV("%s : exiting with no error", __func__); + ALOGV("%s : exiting with no error", __func__); return NO_ERROR; } status_t CameraHardwareSec::autoFocus() { - LOGV("%s :", __func__); + ALOGV("%s :", __func__); /* signal autoFocusThread to run once */ mFocusCondition.signal(); return NO_ERROR; @@ -896,7 +896,7 @@ status_t CameraHardwareSec::autoFocus() /* 2009.10.14 by icarus for added interface */ status_t CameraHardwareSec::cancelAutoFocus() { - LOGV("%s :", __func__); + ALOGV("%s :", __func__); // cancelAutoFocus should be allowed after preview is started. But if // the preview is deferred, cancelAutoFocus will fail. Ignore it if that is @@ -923,7 +923,7 @@ int CameraHardwareSec::save_jpeg( unsigned char *real_jpeg, int jpeg_size) return -1; } - LOGV("[BestIQ] real_jpeg size ========> %d\n", jpeg_size); + ALOGV("[BestIQ] real_jpeg size ========> %d\n", jpeg_size); buffer = (char *) malloc(jpeg_size); if (buffer == NULL) { LOGE("Save YUV] buffer alloc failed"); @@ -1041,7 +1041,7 @@ bool CameraHardwareSec::YUY2toNV21(void *srcBuf, void *dstBuf, uint32_t srcWidth int CameraHardwareSec::pictureThread() { - LOGV("%s :", __func__); + ALOGV("%s :", __func__); int jpeg_size = 0; int ret = NO_ERROR; @@ -1076,7 +1076,7 @@ int CameraHardwareSec::pictureThread() addrs[0].width = mPostViewWidth; addrs[0].height = mPostViewHeight; - LOGV("[5B] mPostViewWidth = %d mPostViewHeight = %d\n",mPostViewWidth,mPostViewHeight); + ALOGV("[5B] mPostViewWidth = %d mPostViewHeight = %d\n",mPostViewWidth,mPostViewHeight); camera_memory_t *JpegHeap = mGetMemoryCb(-1, mJpegHeapSize, 1, 0); sp<MemoryHeapBase> PostviewHeap = new MemoryHeapBase(mPostViewSize); @@ -1157,7 +1157,7 @@ int CameraHardwareSec::pictureThread() JpegExifSize = mSecCamera->getExif((unsigned char *)ExifHeap->data, (unsigned char *)ThumbnailHeap->base()); - LOGV("JpegExifSize=%d", JpegExifSize); + ALOGV("JpegExifSize=%d", JpegExifSize); if (JpegExifSize < 0) { ret = UNKNOWN_ERROR; @@ -1178,7 +1178,7 @@ int CameraHardwareSec::pictureThread() LOG_TIME_END(0) LOG_CAMERA("pictureThread interval: %lu us", LOG_TIME(0)); - LOGV("%s : pictureThread end", __func__); + ALOGV("%s : pictureThread end", __func__); out: JpegHeap->release(JpegHeap); @@ -1209,13 +1209,13 @@ status_t CameraHardwareSec::waitCaptureCompletion() { status_t CameraHardwareSec::takePicture() { - LOGV("%s :", __func__); + ALOGV("%s :", __func__); stopPreview(); if (!mRawHeap) { int rawHeapSize = mPostViewSize; - LOGV("mRawHeap : MemoryHeapBase(previewHeapSize(%d))", rawHeapSize); + ALOGV("mRawHeap : MemoryHeapBase(previewHeapSize(%d))", rawHeapSize); mRawHeap = mGetMemoryCb(-1, rawHeapSize, 1, 0); if (!mRawHeap) { LOGE("ERR(%s): Raw heap creation fail", __func__); @@ -1239,12 +1239,12 @@ status_t CameraHardwareSec::takePicture() status_t CameraHardwareSec::cancelPicture() { - LOGV("%s", __func__); + ALOGV("%s", __func__); if (mPictureThread.get()) { - LOGV("%s: waiting for picture thread to exit", __func__); + ALOGV("%s: waiting for picture thread to exit", __func__); mPictureThread->requestExitAndWait(); - LOGV("%s: picture thread has exited", __func__); + ALOGV("%s: picture thread has exited", __func__); } return NO_ERROR; @@ -1302,7 +1302,7 @@ bool CameraHardwareSec::SplitFrame(unsigned char *pFrame, int dwSize, void *pJPEG, int *pdwJPEGSize, void *pVideo, int *pdwVideoSize) { - LOGV("===========SplitFrame Start=============="); + ALOGV("===========SplitFrame Start=============="); if (NULL == pFrame || 0 >= dwSize) { LOGE("There is no contents (pFrame=%p, dwSize=%d", pFrame, dwSize); @@ -1386,7 +1386,7 @@ bool CameraHardwareSec::SplitFrame(unsigned char *pFrame, int dwSize, if(pdwVideoSize) *pdwVideoSize = 0; } - LOGV("===========SplitFrame end=============="); + ALOGV("===========SplitFrame end=============="); return bRet; } @@ -1412,7 +1412,7 @@ int CameraHardwareSec::decodeInterleaveData(unsigned char *pInterleaveData, int i = 0; - LOGV("decodeInterleaveData Start~~~"); + ALOGV("decodeInterleaveData Start~~~"); while (i < interleaveDataSize) { if ((*interleave_ptr == 0xFFFFFFFF) || (*interleave_ptr == 0x02FFFFFF) || (*interleave_ptr == 0xFF02FFFF)) { @@ -1476,7 +1476,7 @@ int CameraHardwareSec::decodeInterleaveData(unsigned char *pInterleaveData, } } } - LOGV("decodeInterleaveData End~~~"); + ALOGV("decodeInterleaveData End~~~"); return ret; } @@ -1543,7 +1543,7 @@ bool CameraHardwareSec::isSupportedParameter(const char * const parm, status_t CameraHardwareSec::setParameters(const CameraParameters& params) { - LOGV("%s :", __func__); + ALOGV("%s :", __func__); status_t ret = NO_ERROR; @@ -1559,7 +1559,7 @@ status_t CameraHardwareSec::setParameters(const CameraParameters& params) int new_preview_height = 0; params.getPreviewSize(&new_preview_width, &new_preview_height); const char *new_str_preview_format = params.getPreviewFormat(); - LOGV("%s : new_preview_width x new_preview_height = %dx%d, format = %s", + ALOGV("%s : new_preview_width x new_preview_height = %dx%d, format = %s", __func__, new_preview_width, new_preview_height, new_str_preview_format); if (strcmp(new_str_preview_format, CameraParameters::PIXEL_FORMAT_YUV420SP) && @@ -1595,20 +1595,20 @@ status_t CameraHardwareSec::setParameters(const CameraParameters& params) ret = INVALID_OPERATION; } - LOGV("%s: mPreviewWindow (%p) set_buffers_geometry", __func__, mPreviewWindow); - LOGV("%s: mPreviewWindow->set_buffers_geometry (%p)", __func__, + ALOGV("%s: mPreviewWindow (%p) set_buffers_geometry", __func__, mPreviewWindow); + ALOGV("%s: mPreviewWindow->set_buffers_geometry (%p)", __func__, mPreviewWindow->set_buffers_geometry); mPreviewWindow->set_buffers_geometry(mPreviewWindow, new_preview_width, new_preview_height, new_preview_format); - LOGV("%s: DONE mPreviewWindow (%p) set_buffers_geometry", __func__, mPreviewWindow); + ALOGV("%s: DONE mPreviewWindow (%p) set_buffers_geometry", __func__, mPreviewWindow); } mParameters.setPreviewSize(new_preview_width, new_preview_height); mParameters.setPreviewFormat(new_str_preview_format); } } - else LOGV("%s: preview size and format has not changed", __func__); + else ALOGV("%s: preview size and format has not changed", __func__); } else { LOGE("%s: Invalid preview size(%dx%d)", __func__, new_preview_width, new_preview_height); @@ -1620,9 +1620,9 @@ status_t CameraHardwareSec::setParameters(const CameraParameters& params) int new_picture_height = 0; params.getPictureSize(&new_picture_width, &new_picture_height); - LOGV("%s : new_picture_width x new_picture_height = %dx%d", __func__, new_picture_width, new_picture_height); + ALOGV("%s : new_picture_width x new_picture_height = %dx%d", __func__, new_picture_width, new_picture_height); if (0 < new_picture_width && 0 < new_picture_height) { - LOGV("%s: setSnapshotSize", __func__); + ALOGV("%s: setSnapshotSize", __func__); if (mSecCamera->setSnapshotSize(new_picture_width, new_picture_height) < 0) { LOGE("ERR(%s):Fail on mSecCamera->setSnapshotSize(width(%d), height(%d))", __func__, new_picture_width, new_picture_height); @@ -1634,7 +1634,7 @@ status_t CameraHardwareSec::setParameters(const CameraParameters& params) // picture format const char *new_str_picture_format = params.getPictureFormat(); - LOGV("%s : new_str_picture_format %s", __func__, new_str_picture_format); + ALOGV("%s : new_str_picture_format %s", __func__, new_str_picture_format); if (new_str_picture_format != NULL) { int new_picture_format = 0; @@ -1671,7 +1671,7 @@ status_t CameraHardwareSec::setParameters(const CameraParameters& params) //JPEG image quality int new_jpeg_quality = params.getInt(CameraParameters::KEY_JPEG_QUALITY); - LOGV("%s : new_jpeg_quality %d", __func__, new_jpeg_quality); + ALOGV("%s : new_jpeg_quality %d", __func__, new_jpeg_quality); /* we ignore bad values */ if (new_jpeg_quality >=1 && new_jpeg_quality <= 100) { if (mSecCamera->setJpegQuality(new_jpeg_quality) < 0) { @@ -1707,9 +1707,9 @@ status_t CameraHardwareSec::setParameters(const CameraParameters& params) // rotation int new_rotation = params.getInt(CameraParameters::KEY_ROTATION); - LOGV("%s : new_rotation %d", __func__, new_rotation); + ALOGV("%s : new_rotation %d", __func__, new_rotation); if (0 <= new_rotation) { - LOGV("%s : set orientation:%d\n", __func__, new_rotation); + ALOGV("%s : set orientation:%d\n", __func__, new_rotation); if (mSecCamera->setExifOrientationInfo(new_rotation) < 0) { LOGE("ERR(%s):Fail on mSecCamera->setExifOrientationInfo(%d)", __func__, new_rotation); ret = UNKNOWN_ERROR; @@ -1722,7 +1722,7 @@ status_t CameraHardwareSec::setParameters(const CameraParameters& params) int new_exposure_compensation = params.getInt(CameraParameters::KEY_EXPOSURE_COMPENSATION); int max_exposure_compensation = params.getInt(CameraParameters::KEY_MAX_EXPOSURE_COMPENSATION); int min_exposure_compensation = params.getInt(CameraParameters::KEY_MIN_EXPOSURE_COMPENSATION); - LOGV("%s : new_exposure_compensation %d", __func__, new_exposure_compensation); + ALOGV("%s : new_exposure_compensation %d", __func__, new_exposure_compensation); if ((min_exposure_compensation <= new_exposure_compensation) && (max_exposure_compensation >= new_exposure_compensation)) { if (mSecCamera->setBrightness(new_exposure_compensation) < 0) { @@ -1735,7 +1735,7 @@ status_t CameraHardwareSec::setParameters(const CameraParameters& params) // whitebalance const char *new_white_str = params.get(CameraParameters::KEY_WHITE_BALANCE); - LOGV("%s : new_white_str %s", __func__, new_white_str); + ALOGV("%s : new_white_str %s", __func__, new_white_str); if (new_white_str != NULL) { int new_white = -1; @@ -2213,14 +2213,14 @@ status_t CameraHardwareSec::setParameters(const CameraParameters& params) ret = UNKNOWN_ERROR; } } - LOGV("%s return ret = %d", __func__, ret); + ALOGV("%s return ret = %d", __func__, ret); return ret; } CameraParameters CameraHardwareSec::getParameters() const { - LOGV("%s :", __func__); + ALOGV("%s :", __func__); return mParameters; } @@ -2231,7 +2231,7 @@ status_t CameraHardwareSec::sendCommand(int32_t command, int32_t arg1, int32_t a void CameraHardwareSec::release() { - LOGV("%s", __func__); + ALOGV("%s", __func__); /* shut down any threads we have that might be running. do it here * instead of the destructor. we're guaranteed to be on another thread @@ -2335,7 +2335,7 @@ static inline CameraHardwareSec *obj(struct camera_device *dev) static int HAL_camera_device_set_preview_window(struct camera_device *dev, struct preview_stream_ops *buf) { - LOGV("%s", __func__); + ALOGV("%s", __func__); return obj(dev)->setPreviewWindow(buf); } @@ -2347,7 +2347,7 @@ static void HAL_camera_device_set_callbacks(struct camera_device *dev, camera_request_memory get_memory, void* user) { - LOGV("%s", __func__); + ALOGV("%s", __func__); obj(dev)->setCallbacks(notify_cb, data_cb, data_cb_timestamp, get_memory, user); @@ -2363,7 +2363,7 @@ static void HAL_camera_device_set_callbacks(struct camera_device *dev, */ static void HAL_camera_device_enable_msg_type(struct camera_device *dev, int32_t msg_type) { - LOGV("%s", __func__); + ALOGV("%s", __func__); obj(dev)->enableMsgType(msg_type); } @@ -2379,7 +2379,7 @@ static void HAL_camera_device_enable_msg_type(struct camera_device *dev, int32_t */ static void HAL_camera_device_disable_msg_type(struct camera_device *dev, int32_t msg_type) { - LOGV("%s", __func__); + ALOGV("%s", __func__); obj(dev)->disableMsgType(msg_type); } @@ -2390,7 +2390,7 @@ static void HAL_camera_device_disable_msg_type(struct camera_device *dev, int32_ */ static int HAL_camera_device_msg_type_enabled(struct camera_device *dev, int32_t msg_type) { - LOGV("%s", __func__); + ALOGV("%s", __func__); return obj(dev)->msgTypeEnabled(msg_type); } @@ -2399,7 +2399,7 @@ static int HAL_camera_device_msg_type_enabled(struct camera_device *dev, int32_t */ static int HAL_camera_device_start_preview(struct camera_device *dev) { - LOGV("%s", __func__); + ALOGV("%s", __func__); return obj(dev)->startPreview(); } @@ -2408,7 +2408,7 @@ static int HAL_camera_device_start_preview(struct camera_device *dev) */ static void HAL_camera_device_stop_preview(struct camera_device *dev) { - LOGV("%s", __func__); + ALOGV("%s", __func__); obj(dev)->stopPreview(); } @@ -2417,7 +2417,7 @@ static void HAL_camera_device_stop_preview(struct camera_device *dev) */ static int HAL_camera_device_preview_enabled(struct camera_device *dev) { - LOGV("%s", __func__); + ALOGV("%s", __func__); return obj(dev)->previewEnabled(); } @@ -2453,7 +2453,7 @@ static int HAL_camera_device_preview_enabled(struct camera_device *dev) */ static int HAL_camera_device_store_meta_data_in_buffers(struct camera_device *dev, int enable) { - LOGV("%s", __func__); + ALOGV("%s", __func__); return obj(dev)->storeMetaDataInBuffers(enable); } @@ -2469,7 +2469,7 @@ static int HAL_camera_device_store_meta_data_in_buffers(struct camera_device *de */ static int HAL_camera_device_start_recording(struct camera_device *dev) { - LOGV("%s", __func__); + ALOGV("%s", __func__); return obj(dev)->startRecording(); } @@ -2478,7 +2478,7 @@ static int HAL_camera_device_start_recording(struct camera_device *dev) */ static void HAL_camera_device_stop_recording(struct camera_device *dev) { - LOGV("%s", __func__); + ALOGV("%s", __func__); obj(dev)->stopRecording(); } @@ -2487,7 +2487,7 @@ static void HAL_camera_device_stop_recording(struct camera_device *dev) */ static int HAL_camera_device_recording_enabled(struct camera_device *dev) { - LOGV("%s", __func__); + ALOGV("%s", __func__); return obj(dev)->recordingEnabled(); } @@ -2503,7 +2503,7 @@ static int HAL_camera_device_recording_enabled(struct camera_device *dev) static void HAL_camera_device_release_recording_frame(struct camera_device *dev, const void *opaque) { - LOGV("%s", __func__); + ALOGV("%s", __func__); obj(dev)->releaseRecordingFrame(opaque); } @@ -2514,7 +2514,7 @@ static void HAL_camera_device_release_recording_frame(struct camera_device *dev, */ static int HAL_camera_device_auto_focus(struct camera_device *dev) { - LOGV("%s", __func__); + ALOGV("%s", __func__); return obj(dev)->autoFocus(); } @@ -2526,7 +2526,7 @@ static int HAL_camera_device_auto_focus(struct camera_device *dev) */ static int HAL_camera_device_cancel_auto_focus(struct camera_device *dev) { - LOGV("%s", __func__); + ALOGV("%s", __func__); return obj(dev)->cancelAutoFocus(); } @@ -2535,7 +2535,7 @@ static int HAL_camera_device_cancel_auto_focus(struct camera_device *dev) */ static int HAL_camera_device_take_picture(struct camera_device *dev) { - LOGV("%s", __func__); + ALOGV("%s", __func__); return obj(dev)->takePicture(); } @@ -2545,7 +2545,7 @@ static int HAL_camera_device_take_picture(struct camera_device *dev) */ static int HAL_camera_device_cancel_picture(struct camera_device *dev) { - LOGV("%s", __func__); + ALOGV("%s", __func__); return obj(dev)->cancelPicture(); } @@ -2556,7 +2556,7 @@ static int HAL_camera_device_cancel_picture(struct camera_device *dev) static int HAL_camera_device_set_parameters(struct camera_device *dev, const char *parms) { - LOGV("%s", __func__); + ALOGV("%s", __func__); String8 str(parms); CameraParameters p(str); return obj(dev)->setParameters(p); @@ -2565,7 +2565,7 @@ static int HAL_camera_device_set_parameters(struct camera_device *dev, /** Return the camera parameters. */ char *HAL_camera_device_get_parameters(struct camera_device *dev) { - LOGV("%s", __func__); + ALOGV("%s", __func__); String8 str; CameraParameters parms = obj(dev)->getParameters(); str = parms.flatten(); @@ -2574,7 +2574,7 @@ char *HAL_camera_device_get_parameters(struct camera_device *dev) void HAL_camera_device_put_parameters(struct camera_device *dev, char *parms) { - LOGV("%s", __func__); + ALOGV("%s", __func__); free(parms); } @@ -2584,7 +2584,7 @@ void HAL_camera_device_put_parameters(struct camera_device *dev, char *parms) static int HAL_camera_device_send_command(struct camera_device *dev, int32_t cmd, int32_t arg1, int32_t arg2) { - LOGV("%s", __func__); + ALOGV("%s", __func__); return obj(dev)->sendCommand(cmd, arg1, arg2); } @@ -2594,7 +2594,7 @@ static int HAL_camera_device_send_command(struct camera_device *dev, */ static void HAL_camera_device_release(struct camera_device *dev) { - LOGV("%s", __func__); + ALOGV("%s", __func__); obj(dev)->release(); } @@ -2603,19 +2603,19 @@ static void HAL_camera_device_release(struct camera_device *dev) */ static int HAL_camera_device_dump(struct camera_device *dev, int fd) { - LOGV("%s", __func__); + ALOGV("%s", __func__); return obj(dev)->dump(fd); } static int HAL_getNumberOfCameras() { - LOGV("%s", __func__); + ALOGV("%s", __func__); return sizeof(sCameraInfo) / sizeof(sCameraInfo[0]); } static int HAL_getCameraInfo(int cameraId, struct camera_info *cameraInfo) { - LOGV("%s", __func__); + ALOGV("%s", __func__); memcpy(cameraInfo, &sCameraInfo[cameraId], sizeof(CameraInfo)); return 0; } @@ -2654,7 +2654,7 @@ static int HAL_camera_device_open(const struct hw_module_t* module, const char *id, struct hw_device_t** device) { - LOGV("%s", __func__); + ALOGV("%s", __func__); int cameraId = atoi(id); if (cameraId < 0 || cameraId >= HAL_getNumberOfCameras()) { @@ -2664,7 +2664,7 @@ static int HAL_camera_device_open(const struct hw_module_t* module, if (g_cam_device) { if (obj(g_cam_device)->getCameraId() == cameraId) { - LOGV("returning existing camera ID %s", id); + ALOGV("returning existing camera ID %s", id); goto done; } else { LOGE("Cannot open camera %d. camera %d is already running!", diff --git a/libhwcomposer/SecHWC.cpp b/libhwcomposer/SecHWC.cpp index 31c0b2c..cd15de0 100644 --- a/libhwcomposer/SecHWC.cpp +++ b/libhwcomposer/SecHWC.cpp @@ -118,7 +118,7 @@ static int set_src_dst_info(hwc_layer_t *cur, dst_rect->w = win->rect_info.w; dst_rect->h = win->rect_info.h; - LOGV("%s::sr_x %d sr_y %d sr_w %d sr_h %d dr_x %d dr_y %d dr_w %d dr_h %d ", + ALOGV("%s::sr_x %d sr_y %d sr_w %d sr_h %d dr_x %d dr_y %d dr_w %d dr_h %d ", __func__, src_rect->x, src_rect->y, src_rect->w, src_rect->h, dst_rect->x, dst_rect->y, dst_rect->w, dst_rect->h); @@ -128,7 +128,7 @@ static int set_src_dst_info(hwc_layer_t *cur, static int get_hwc_compos_decision(hwc_layer_t* cur) { if(cur->flags & HWC_SKIP_LAYER || !cur->handle) { - LOGV("%s::is_skip_layer %d cur->handle %x", + ALOGV("%s::is_skip_layer %d cur->handle %x", __func__, cur->flags & HWC_SKIP_LAYER, (uint32_t)cur->handle); return HWC_FRAMEBUFFER; } @@ -156,7 +156,7 @@ static int get_hwc_compos_decision(hwc_layer_t* cur) else compositionType = HWC_FRAMEBUFFER; - LOGV("%s::compositionType %d bpp %d format %x usage %x", + ALOGV("%s::compositionType %d bpp %d format %x usage %x", __func__,compositionType, prev_handle->uiBpp, prev_handle->iFormat, prev_handle->usage & GRALLOC_USAGE_PHYS_CONTIG); @@ -196,7 +196,7 @@ static int assign_overlay_window(struct hwc_context_t *ctx, win->layer_index = layer_idx; win->status = HWC_WIN_RESERVED; - LOGV("%s:: win_x %d win_y %d win_w %d win_h %d lay_idx %d win_idx %d", + ALOGV("%s:: win_x %d win_y %d win_w %d win_h %d lay_idx %d win_idx %d", __func__, win->rect_info.x, win->rect_info.y, win->rect_info.w, win->rect_info.h, win->layer_index, win_idx ); @@ -231,7 +231,7 @@ static int hwc_prepare(hwc_composer_device_t *dev, hwc_layer_list_t* list) } ctx->num_of_hwc_layer = 0; ctx->num_of_fb_layer = 0; - LOGV("%s:: hwc_prepare list->numHwLayers %d", __func__, list->numHwLayers); + ALOGV("%s:: hwc_prepare list->numHwLayers %d", __func__, list->numHwLayers); for (int i = 0; i < list->numHwLayers ; i++) { hwc_layer_t* cur = &list->hwLayers[i]; @@ -262,7 +262,7 @@ static int hwc_prepare(hwc_composer_device_t *dev, hwc_layer_list_t* list) } if(list->numHwLayers != (ctx->num_of_fb_layer + ctx->num_of_hwc_layer)) - LOGV("%s:: numHwLayers %d num_of_fb_layer %d num_of_hwc_layer %d ", + ALOGV("%s:: numHwLayers %d num_of_fb_layer %d num_of_hwc_layer %d ", __func__, list->numHwLayers, ctx->num_of_fb_layer, ctx->num_of_hwc_layer); diff --git a/liblight/lights.c b/liblight/lights.c index ee6416a..02187a7 100755 --- a/liblight/lights.c +++ b/liblight/lights.c @@ -37,7 +37,7 @@ static int write_int(char const *path, int value) already_warned = 0; - LOGV("write_int: path %s, value %d", path, value); + ALOGV("write_int: path %s, value %d", path, value); fd = open(path, O_RDWR); if (fd >= 0) { @@ -78,7 +78,7 @@ static int set_light_backlight(struct light_device_t *dev, static int close_lights(struct light_device_t *dev) { - LOGV("close_light is called"); + ALOGV("close_light is called"); if (dev) free(dev); @@ -91,7 +91,7 @@ static int open_lights(const struct hw_module_t *module, char const *name, int (*set_light)(struct light_device_t *dev, struct light_state_t const *state); - LOGV("open_lights: open with %s", name); + ALOGV("open_lights: open with %s", name); if (0 == strcmp(LIGHT_ID_BACKLIGHT, name)) set_light = set_light_backlight; diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index ab0780b..0bfc868 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -98,7 +98,6 @@ specified --> <string name="default_wallpaper_component">com.android.wallpaper/.nexus.NexusWallpaper</string> - <integer name="config_deskDockRotation">90</integer> <integer name="config_deskDockKeepsScreenOn">0</integer> <integer name="config_carDockKeepsScreenOn">1</integer> diff --git a/recovery/Android.mk b/recovery/Android.mk index 2100f3d..0d65438 100644 --- a/recovery/Android.mk +++ b/recovery/Android.mk @@ -5,7 +5,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := eng LOCAL_C_INCLUDES += bootable/recovery -LOCAL_SRC_FILES := recovery_ui.c +LOCAL_SRC_FILES := recovery_ui.cpp # should match TARGET_RECOVERY_UI_LIB set in BoardConfig.mk LOCAL_MODULE := librecovery_ui_crespo diff --git a/recovery/recovery_ui.c b/recovery/recovery_ui.c deleted file mode 100644 index 81ed4f2..0000000 --- a/recovery/recovery_ui.c +++ /dev/null @@ -1,115 +0,0 @@ -/* - * 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. - */ - -#include <linux/input.h> -#include <sys/stat.h> -#include <errno.h> -#include <string.h> - -#include "recovery_ui.h" -#include "common.h" - -char* MENU_HEADERS[] = { "Volume up/down to move highlight;", - "power button to select.", - "", - NULL }; - -char* MENU_ITEMS[] = { "reboot system now", - "apply update from /sdcard", - "wipe data/factory reset", - "wipe cache partition", - NULL }; - -void device_ui_init(UIParameters* ui_parameters) { -} - -int device_recovery_start() { - // recovery can get started before the kernel has created the EMMC - // devices, which will make the wipe_data operation fail (trying - // to open a device that doesn't exist). Hold up the start of - // recovery for up to 5 seconds waiting for the userdata partition - // block device to exist. - - const char* fn = "/dev/block/platform/s3c-sdhci.0/by-name/userdata"; - - int tries = 0; - int ret; - struct stat buf; - do { - ++tries; - ret = stat(fn, &buf); - if (ret) { - printf("try %d: %s\n", tries, strerror(errno)); - sleep(1); - } - } while (ret && tries < 5); - if (!ret) { - printf("stat() of %s succeeded on try %d\n", fn, tries); - } else { - printf("failed to stat %s\n", fn); - } - - // We let recovery attempt to carry on even if the stat never - // succeeded. - - return 0; -} - -int device_toggle_display(volatile char* key_pressed, int key_code) { - // hold power and press volume-up - return key_pressed[KEY_POWER] && key_code == KEY_VOLUMEUP; -} - -int device_reboot_now(volatile char* key_pressed, int key_code) { - // Reboot if the power key is pressed five times in a row, with - // no other keys in between. - static int presses = 0; - if (key_code == KEY_POWER) { // power button - ++presses; - return presses == 5; - } else { - presses = 0; - return 0; - } -} - -int device_handle_key(int key_code, int visible) { - if (visible) { - switch (key_code) { - case KEY_DOWN: - case KEY_VOLUMEDOWN: - return HIGHLIGHT_DOWN; - - case KEY_UP: - case KEY_VOLUMEUP: - return HIGHLIGHT_UP; - - case KEY_ENTER: - case KEY_POWER: // crespo power - return SELECT_ITEM; - } - } - - return NO_ACTION; -} - -int device_perform_action(int which) { - return which; -} - -int device_wipe_data() { - return 0; -} diff --git a/recovery/recovery_ui.cpp b/recovery/recovery_ui.cpp new file mode 100644 index 0000000..4c615f8 --- /dev/null +++ b/recovery/recovery_ui.cpp @@ -0,0 +1,110 @@ +/* + * 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. + */ + +#include <linux/input.h> +#include <sys/stat.h> +#include <errno.h> +#include <string.h> + +#include "common.h" +#include "device.h" +#include "screen_ui.h" + +const char* HEADERS[] = { "Volume up/down to move highlight;", + "power button to select.", + "", + NULL }; + +const char* ITEMS[] = { "reboot system now", + "apply update from /sdcard", + "wipe data/factory reset", + "wipe cache partition", + NULL }; + + + +class CrespoUI : public ScreenRecoveryUI { + public: + CrespoUI() : + consecutive_power_keys(0) { + } + + virtual KeyAction CheckKey(int key) { + if (IsKeyPressed(KEY_POWER) && key == KEY_VOLUMEUP) { + return TOGGLE; + } + if (key == KEY_POWER) { + ++consecutive_power_keys; + if (consecutive_power_keys >= 7) { + return REBOOT; + } + } else { + consecutive_power_keys = 0; + } + return ENQUEUE; + } + + private: + int consecutive_power_keys; +}; + +class CrespoDevice : public Device { + public: + CrespoDevice() : + ui(new CrespoUI) { + } + + RecoveryUI* GetUI() { return ui; } + + int HandleMenuKey(int key_code, int visible) { + if (visible) { + switch (key_code) { + case KEY_DOWN: + case KEY_VOLUMEDOWN: + return kHighlightDown; + + case KEY_UP: + case KEY_VOLUMEUP: + return kHighlightUp; + + case KEY_POWER: + return kInvokeItem; + } + } + + return kNoAction; + } + + BuiltinAction InvokeMenuItem(int menu_position) { + switch (menu_position) { + case 0: return REBOOT; + case 1: return APPLY_EXT; + case 2: return WIPE_DATA; + case 3: return WIPE_CACHE; + default: return NO_ACTION; + } + } + + const char* const* GetMenuHeaders() { return HEADERS; } + const char* const* GetMenuItems() { return ITEMS; } + + private: + RecoveryUI* ui; +}; + +Device* make_device() { + return new CrespoDevice; +} diff --git a/sec_mm/sec_omx/sec_codecs/video/mfc_c110/dec/src/SsbSipMfcDecAPI.c b/sec_mm/sec_omx/sec_codecs/video/mfc_c110/dec/src/SsbSipMfcDecAPI.c index 8e47683..2ee0b79 100644 --- a/sec_mm/sec_omx/sec_codecs/video/mfc_c110/dec/src/SsbSipMfcDecAPI.c +++ b/sec_mm/sec_omx/sec_codecs/video/mfc_c110/dec/src/SsbSipMfcDecAPI.c @@ -56,8 +56,8 @@ static mfc_packed_mode isPBPacked(_MFCLIB *pCtx, int length) while (1) { while (startCode != USR_DATA_START_CODE) { if (startCode == VOP_START_CODE) { - LOGV("isPBPacked: VOP START Found !!.....return\n"); - LOGV("isPBPacked: Non Packed PB\n"); + ALOGV("isPBPacked: VOP START Found !!.....return\n"); + ALOGV("isPBPacked: Non Packed PB\n"); return MFC_UNPACKED_PB; } getAByte(strmBuffer, &startCode); @@ -65,7 +65,7 @@ static mfc_packed_mode isPBPacked(_MFCLIB *pCtx, int length) if (strmBuffer >= strmBufferEnd) goto out; } - LOGV("isPBPacked: User Data Found !!\n"); + ALOGV("isPBPacked: User Data Found !!\n"); do { if (*strmBuffer == 'p') { @@ -80,7 +80,7 @@ static mfc_packed_mode isPBPacked(_MFCLIB *pCtx, int length) } out: - LOGV("isPBPacked: Non Packed PB\n"); + ALOGV("isPBPacked: Non Packed PB\n"); return MFC_UNPACKED_PB; } diff --git a/sec_mm/sec_omx/sec_codecs/video/mfc_c110/enc/src/SsbSipMfcEncAPI.c b/sec_mm/sec_omx/sec_codecs/video/mfc_c110/enc/src/SsbSipMfcEncAPI.c index b51a55f..9534be7 100644 --- a/sec_mm/sec_omx/sec_codecs/video/mfc_c110/enc/src/SsbSipMfcEncAPI.c +++ b/sec_mm/sec_omx/sec_codecs/video/mfc_c110/enc/src/SsbSipMfcEncAPI.c @@ -94,7 +94,7 @@ SSBSIP_MFC_ERROR_CODE SsbSipMfcEncInit(void *openHandle, void *param) pCTX = (_MFCLIB *)openHandle; memset(&EncArg, 0, sizeof(mfc_common_args)); - LOGV("SsbSipMfcEncInit: Encode Init start\n"); + ALOGV("SsbSipMfcEncInit: Encode Init start\n"); mpeg4_arg = (SSBSIP_MFC_ENC_MPEG4_PARAM *)param; codec_type = mpeg4_arg->codecType; @@ -110,7 +110,7 @@ SSBSIP_MFC_ERROR_CODE SsbSipMfcEncInit(void *openHandle, void *param) switch (pCTX->codec_type) { case MPEG4_ENC: - LOGV("SsbSipMfcEncInit: MPEG4 Encode\n"); + ALOGV("SsbSipMfcEncInit: MPEG4 Encode\n"); mpeg4_arg = (SSBSIP_MFC_ENC_MPEG4_PARAM *)param; pCTX->width = mpeg4_arg->SourceWidth; @@ -118,7 +118,7 @@ SSBSIP_MFC_ERROR_CODE SsbSipMfcEncInit(void *openHandle, void *param) break; case H263_ENC: - LOGV("SsbSipMfcEncInit: H263 Encode\n"); + ALOGV("SsbSipMfcEncInit: H263 Encode\n"); h263_arg = (SSBSIP_MFC_ENC_H263_PARAM *)param; pCTX->width = h263_arg->SourceWidth; @@ -126,7 +126,7 @@ SSBSIP_MFC_ERROR_CODE SsbSipMfcEncInit(void *openHandle, void *param) break; case H264_ENC: - LOGV("SsbSipMfcEncInit: H264 Encode\n"); + ALOGV("SsbSipMfcEncInit: H264 Encode\n"); h264_arg = (SSBSIP_MFC_ENC_H264_PARAM *)param; pCTX->width = h264_arg->SourceWidth; @@ -526,7 +526,7 @@ SSBSIP_MFC_ERROR_CODE SsbSipMfcEncSetInBuf(void *openHandle, SSBSIP_MFC_ENC_INPU return MFC_RET_INVALID_PARAM; } - LOGV("SsbSipMfcEncSetInBuf: input_info->YPhyAddr & input_info->CPhyAddr should be 64KB aligned\n"); + ALOGV("SsbSipMfcEncSetInBuf: input_info->YPhyAddr & input_info->CPhyAddr should be 64KB aligned\n"); pCTX = (_MFCLIB *)openHandle; |