summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libaudio/AudioHardware.cpp22
-rwxr-xr-xlibcamera/SecCamera.cpp8
-rwxr-xr-xlibcamera/SecCameraHWInterface.cpp4
-rw-r--r--libs3cjpeg/JpegEncoder.cpp2
4 files changed, 18 insertions, 18 deletions
diff --git a/libaudio/AudioHardware.cpp b/libaudio/AudioHardware.cpp
index 89d248d..d644f12 100644
--- a/libaudio/AudioHardware.cpp
+++ b/libaudio/AudioHardware.cpp
@@ -251,7 +251,7 @@ void AudioHardware::closeOutputStream(AudioStreamOut* out) {
{
Mutex::Autolock lock(mLock);
if (mOutput == 0 || mOutput.get() != out) {
- LOGW("Attempt to close invalid output stream");
+ ALOGW("Attempt to close invalid output stream");
return;
}
spOut = mOutput;
@@ -316,7 +316,7 @@ void AudioHardware::closeInputStream(AudioStreamIn* in) {
ssize_t index = mInputs.indexOf((AudioStreamInALSA *)in);
if (index < 0) {
- LOGW("Attempt to close invalid input stream");
+ ALOGW("Attempt to close invalid input stream");
return;
}
spIn = mInputs[index];
@@ -543,16 +543,16 @@ String8 AudioHardware::getParameters(const String8& keys)
size_t AudioHardware::getInputBufferSize(uint32_t sampleRate, int format, int channelCount)
{
if (format != AudioSystem::PCM_16_BIT) {
- LOGW("getInputBufferSize bad format: %d", format);
+ ALOGW("getInputBufferSize bad format: %d", format);
return 0;
}
if (channelCount < 1 || channelCount > 2) {
- LOGW("getInputBufferSize bad channel count: %d", channelCount);
+ ALOGW("getInputBufferSize bad channel count: %d", channelCount);
return 0;
}
if (sampleRate != getInputSampleRate(sampleRate)) {
- LOGW("getInputBufferSize bad sample rate: %d", sampleRate);
+ ALOGW("getInputBufferSize bad sample rate: %d", sampleRate);
return 0;
}
@@ -610,7 +610,7 @@ void AudioHardware::setVoiceVolume_l(float volume)
break;
default:
- LOGW("### Call volume setting error!!!0x%08x \n", device);
+ ALOGW("### Call volume setting error!!!0x%08x \n", device);
type = SOUND_TYPE_VOICE;
break;
}
@@ -744,7 +744,7 @@ status_t AudioHardware::setIncallPath_l(uint32_t device)
path = SOUND_AUDIO_PATH_HEADSET;
break;
default:
- LOGW("### incall mode Error!! route = [%d]", device);
+ ALOGW("### incall mode Error!! route = [%d]", device);
path = SOUND_AUDIO_PATH_HANDSET;
break;
}
@@ -1209,7 +1209,7 @@ ssize_t AudioHardware::AudioStreamOutALSA::write(const void* buffer, size_t byte
ALOGV("-----AudioStreamInALSA::write(%p, %d) END", buffer, (int)bytes);
return bytes;
}
- LOGW("write error: %d", errno);
+ ALOGW("write error: %d", errno);
status = -errno;
}
Error:
@@ -1495,7 +1495,7 @@ status_t AudioHardware::AudioStreamInALSA::set(
&mBufferProvider.mProvider,
&mDownSampler);
if (status != 0) {
- LOGW("AudioStreamInALSA::set() downsampler init failed: %d", status);
+ ALOGW("AudioStreamInALSA::set() downsampler init failed: %d", status);
mDownSampler = NULL;
return status;
}
@@ -1728,7 +1728,7 @@ void AudioHardware::AudioStreamInALSA::getCaptureDelay(size_t frames,
buffer->time_stamp.tv_sec = 0;
buffer->time_stamp.tv_nsec = 0;
buffer->delay_ns = 0;
- LOGW("read getCaptureDelay(): pcm_htimestamp error");
+ ALOGW("read getCaptureDelay(): pcm_htimestamp error");
return;
}
@@ -1836,7 +1836,7 @@ ssize_t AudioHardware::AudioStreamInALSA::read(void* buffer, ssize_t bytes)
return framesRd * mChannelCount * sizeof(int16_t);
}
- LOGW("read error: %d", (int)framesRd);
+ ALOGW("read error: %d", (int)framesRd);
status = framesRd;
}
diff --git a/libcamera/SecCamera.cpp b/libcamera/SecCamera.cpp
index cdf71ae..fd1b9ac 100755
--- a/libcamera/SecCamera.cpp
+++ b/libcamera/SecCamera.cpp
@@ -798,7 +798,7 @@ int SecCamera::stopPreview(void)
ALOGV("%s :", __func__);
if (m_flag_camera_start == 0) {
- LOGW("%s: doing nothing because m_flag_camera_start is zero", __func__);
+ ALOGW("%s: doing nothing because m_flag_camera_start is zero", __func__);
return 0;
}
@@ -882,7 +882,7 @@ int SecCamera::stopRecord(void)
ALOGV("%s :", __func__);
if (m_flag_record_start == 0) {
- LOGW("%s: doing nothing because m_flag_record_start is zero", __func__);
+ ALOGW("%s: doing nothing because m_flag_record_start is zero", __func__);
return 0;
}
@@ -1088,7 +1088,7 @@ int SecCamera::setSnapshotCmd(void)
if (m_flag_camera_start > 0) {
LOG_TIME_START(0)
- LOGW("WARN(%s):Camera was in preview, should have been stopped\n", __func__);
+ ALOGW("WARN(%s):Camera was in preview, should have been stopped\n", __func__);
stopPreview();
LOG_TIME_END(0)
}
@@ -1308,7 +1308,7 @@ int SecCamera::getSnapshotAndJpeg(unsigned char *yuv_buf, unsigned char *jpeg_bu
if (m_flag_camera_start > 0) {
LOG_TIME_START(0)
- LOGW("WARN(%s):Camera was in preview, should have been stopped\n", __func__);
+ ALOGW("WARN(%s):Camera was in preview, should have been stopped\n", __func__);
stopPreview();
LOG_TIME_END(0)
}
diff --git a/libcamera/SecCameraHWInterface.cpp b/libcamera/SecCameraHWInterface.cpp
index 8609918..0efd85d 100755
--- a/libcamera/SecCameraHWInterface.cpp
+++ b/libcamera/SecCameraHWInterface.cpp
@@ -1701,7 +1701,7 @@ status_t CameraHardwareSec::setParameters(const CameraParameters& params)
* on scene mode. don't return an error because it causes CTS failure.
*/
if (new_frame_rate != mParameters.getPreviewFrameRate()) {
- LOGW("WARN(%s): request for preview frame %d not allowed, != %d\n",
+ ALOGW("WARN(%s): request for preview frame %d not allowed, != %d\n",
__func__, new_frame_rate, mParameters.getPreviewFrameRate());
}
@@ -1785,7 +1785,7 @@ status_t CameraHardwareSec::setParameters(const CameraParameters& params)
if (new_scene_mode_str && current_scene_mode_str) {
if (!strcmp(new_scene_mode_str, current_scene_mode_str)) {
if ((new_min_fps != current_min_fps) || (new_max_fps != current_max_fps)) {
- LOGW("%s : requested new_min_fps = %d, new_max_fps = %d not allowed",
+ ALOGW("%s : requested new_min_fps = %d, new_max_fps = %d not allowed",
__func__, new_min_fps, new_max_fps);
LOGE("%s : current_min_fps = %d, current_max_fps = %d",
__func__, current_min_fps, current_max_fps);
diff --git a/libs3cjpeg/JpegEncoder.cpp b/libs3cjpeg/JpegEncoder.cpp
index 0273377..fb70a07 100644
--- a/libs3cjpeg/JpegEncoder.cpp
+++ b/libs3cjpeg/JpegEncoder.cpp
@@ -632,7 +632,7 @@ jpg_return_status JpegEncoder::checkMcu(sample_mode_t sampleMode,
if (expectedWidth == width && expectedHeight == height)
return JPG_SUCCESS;
- LOGW("The image is not matched for MCU");
+ ALOGW("The image is not matched for MCU");
uint32_t size = width*height * 2;
char *srcBuf, *dstBuf;
generated by cgit v1.1 at 2024-06-02 07:41:04 +0000