Skip to content

Commit

Permalink
Use new logging macro names
Browse files Browse the repository at this point in the history 
Change-Id: Id0f0e5cb255bbcbb3885f725a5bbe0b911d559e2
  • Loading branch information
Steve Block committed Jan 23, 2012
1 parent 8ce5d53 commit cbd4fae
Showing 1 changed file with 23 additions and 23 deletions.
46 changes: 23 additions & 23 deletions audio/audio_hw.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#ifndef LOG_NDEBUG_FUNCTION
#define LOGFUNC(...) ((void)0)
#else
#define LOGFUNC(...) (LOGV(__VA_ARGS__))
#define LOGFUNC(...) (ALOGV(__VA_ARGS__))
#endif

#include <errno.h>
Expand Down Expand Up @@ -677,7 +677,7 @@ static void remove_channels_from_buf(struct buffer_remix *data, void *buf, size_
out_frame = data->out_chans * samp_size;

if (out_frame >= in_frame) {
LOGE("BUG: remove_channels_from_buf() can not add channels to a buffer.\n");
ALOGE("BUG: remove_channels_from_buf() can not add channels to a buffer.\n");
return;
}

Expand Down Expand Up @@ -709,14 +709,14 @@ static void setup_stereo_to_mono_input_remix(struct omap4_stream_in *in)
br->in_chans = 2;
br->out_chans = 1;
} else
LOGE("Could not allocate memory for struct buffer_remix\n");
ALOGE("Could not allocate memory for struct buffer_remix\n");

if (in->buffer) {
size_t chans = (br->in_chans > br->out_chans) ? br->in_chans : br->out_chans;
free(in->buffer);
in->buffer = malloc(in->config.period_size * br->sample_size * chans);
if (!in->buffer)
LOGE("Could not reallocate memory for input buffer\n");
ALOGE("Could not reallocate memory for input buffer\n");
}

if (in->remix_at_driver)
Expand Down Expand Up @@ -792,7 +792,7 @@ static int set_route_by_array(struct mixer *mixer, struct route_setting *route,

static int start_call(struct omap4_audio_device *adev)
{
LOGE("Opening modem PCMs");
ALOGE("Opening modem PCMs");
LOGFUNC("%s(%p)", __FUNCTION__, adev);

pcm_config_vx.rate = VX_NB_SAMPLING_RATE;
Expand All @@ -801,15 +801,15 @@ static int start_call(struct omap4_audio_device *adev)
if (adev->pcm_modem_dl == NULL) {
adev->pcm_modem_dl = pcm_open(0, PORT_MODEM, PCM_OUT, &pcm_config_vx);
if (!pcm_is_ready(adev->pcm_modem_dl)) {
LOGE("cannot open PCM modem DL stream: %s", pcm_get_error(adev->pcm_modem_dl));
ALOGE("cannot open PCM modem DL stream: %s", pcm_get_error(adev->pcm_modem_dl));
goto err_open_dl;
}
}

if (adev->pcm_modem_ul == NULL) {
adev->pcm_modem_ul = pcm_open(0, PORT_MODEM, PCM_IN, &pcm_config_vx);
if (!pcm_is_ready(adev->pcm_modem_ul)) {
LOGE("cannot open PCM modem UL stream: %s", pcm_get_error(adev->pcm_modem_ul));
ALOGE("cannot open PCM modem UL stream: %s", pcm_get_error(adev->pcm_modem_ul));
goto err_open_ul;
}
}
Expand All @@ -831,7 +831,7 @@ static int start_call(struct omap4_audio_device *adev)

static void end_call(struct omap4_audio_device *adev)
{
LOGE("Closing modem PCMs");
ALOGE("Closing modem PCMs");
LOGFUNC("%s(%p)", __FUNCTION__, adev);

pcm_stop(adev->pcm_modem_dl);
Expand Down Expand Up @@ -963,7 +963,7 @@ static void select_mode(struct omap4_audio_device *adev)
LOGFUNC("%s(%p)", __FUNCTION__, adev);

if (adev->mode == AUDIO_MODE_IN_CALL) {
LOGE("Entering IN_CALL state, in_call=%d", adev->in_call);
ALOGE("Entering IN_CALL state, in_call=%d", adev->in_call);
if (!adev->in_call) {
force_all_standby(adev);
/* force earpiece route for in call state if speaker is the
Expand All @@ -987,7 +987,7 @@ static void select_mode(struct omap4_audio_device *adev)
adev->in_call = 1;
}
} else {
LOGE("Leaving IN_CALL state, in_call=%d, mode=%d",
ALOGE("Leaving IN_CALL state, in_call=%d, mode=%d",
adev->in_call, adev->mode);
if (adev->in_call) {
adev->in_call = 0;
Expand Down Expand Up @@ -1321,7 +1321,7 @@ static int start_output_stream(struct omap4_stream_out *out)
out->pcm = pcm_open(card, port, PCM_OUT | PCM_MMAP, &out->config);

if (!pcm_is_ready(out->pcm)) {
LOGE("cannot open pcm_out driver: %s", pcm_get_error(out->pcm));
ALOGE("cannot open pcm_out driver: %s", pcm_get_error(out->pcm));
pcm_close(out->pcm);
adev->active_output = NULL;
return -ENOMEM;
Expand Down Expand Up @@ -1462,7 +1462,7 @@ static int get_playback_delay(struct omap4_stream_out *out,
buffer->time_stamp.tv_sec = 0;
buffer->time_stamp.tv_nsec = 0;
buffer->delay_ns = 0;
LOGV("get_playback_delay(): pcm_get_htimestamp error,"
ALOGV("get_playback_delay(): pcm_get_htimestamp error,"
"setting playbackTimestamp to 0");
return status;
}
Expand Down Expand Up @@ -1827,7 +1827,7 @@ static int start_input_stream(struct omap4_stream_in *in)
if (in->remix_at_driver)
in->config.channels = in->remix_at_driver->out_chans;
if (!pcm_is_ready(in->pcm)) {
LOGE("cannot open pcm_in driver: %s", pcm_get_error(in->pcm));
ALOGE("cannot open pcm_in driver: %s", pcm_get_error(in->pcm));
pcm_close(in->pcm);
adev->active_input = NULL;
return -ENOMEM;
Expand Down Expand Up @@ -2039,7 +2039,7 @@ static void get_capture_delay(struct omap4_stream_in *in,
buffer->time_stamp.tv_sec = 0;
buffer->time_stamp.tv_nsec = 0;
buffer->delay_ns = 0;
LOGW("read get_capture_delay(): pcm_htimestamp error");
ALOGW("read get_capture_delay(): pcm_htimestamp error");
return;
}

Expand All @@ -2060,7 +2060,7 @@ static void get_capture_delay(struct omap4_stream_in *in,

buffer->time_stamp = tstamp;
buffer->delay_ns = delay_ns;
LOGV("get_capture_delay time_stamp = [%ld].[%ld], delay_ns: [%d],"
ALOGV("get_capture_delay time_stamp = [%ld].[%ld], delay_ns: [%d],"
" kernel_delay:[%ld], buf_delay:[%ld], rsmp_delay:[%ld], kernel_frames:[%d], "
"in->frames_in:[%d], in->proc_frames_in:[%d], frames:[%d]",
buffer->time_stamp.tv_sec , buffer->time_stamp.tv_nsec, buffer->delay_ns,
Expand All @@ -2076,7 +2076,7 @@ static int32_t update_echo_reference(struct omap4_stream_in *in, size_t frames)

LOGFUNC("%s(%p, %ul)", __FUNCTION__, in, frames);

LOGV("update_echo_reference, frames = [%d], in->ref_frames_in = [%d], "
ALOGV("update_echo_reference, frames = [%d], in->ref_frames_in = [%d], "
"b.frame_count = [%d]",
frames, in->ref_frames_in, frames - in->ref_frames_in);
if (in->ref_frames_in < frames) {
Expand All @@ -2095,12 +2095,12 @@ static int32_t update_echo_reference(struct omap4_stream_in *in, size_t frames)
if (in->echo_reference->read(in->echo_reference, &b) == 0)
{
in->ref_frames_in += b.frame_count;
LOGV("update_echo_reference: in->ref_frames_in:[%d], "
ALOGV("update_echo_reference: in->ref_frames_in:[%d], "
"in->ref_buf_size:[%d], frames:[%d], b.frame_count:[%d]",
in->ref_frames_in, in->ref_buf_size, frames, b.frame_count);
}
} else
LOGW("update_echo_reference: NOT enough frames to read ref buffer");
ALOGW("update_echo_reference: NOT enough frames to read ref buffer");
return b.delay_ns;
}

Expand Down Expand Up @@ -2208,7 +2208,7 @@ static int get_next_buffer(struct resampler_buffer_provider *buffer_provider,
(void*)in->buffer,
in->config.period_size * hw_frame_size);
if (in->read_status != 0) {
LOGE("get_next_buffer() pcm_read error %d", in->read_status);
ALOGE("get_next_buffer() pcm_read error %d", in->read_status);
buffer->raw = NULL;
buffer->frame_count = 0;
return in->read_status;
Expand Down Expand Up @@ -2311,7 +2311,7 @@ static ssize_t process_frames(struct omap4_stream_in *in, void* buffer, ssize_t
in->proc_buf = (int16_t *)realloc(in->proc_buf,
in->proc_buf_size *
in->config.channels * sizeof(int16_t));
LOGV("process_frames(): in->proc_buf %p size extended to %d frames",
ALOGV("process_frames(): in->proc_buf %p size extended to %d frames",
in->proc_buf, in->proc_buf_size);
}
frames_rd = read_frames(in,
Expand Down Expand Up @@ -2911,7 +2911,7 @@ static int adev_open(const hw_module_t* module, const char* name,
adev->mixer = mixer_open(0);
if (!adev->mixer) {
free(adev);
LOGE("Unable to open the mixer, aborting.");
ALOGE("Unable to open the mixer, aborting.");
return -EINVAL;
}

Expand Down Expand Up @@ -2963,7 +2963,7 @@ static int adev_open(const hw_module_t* module, const char* name,
!adev->mixer_ctls.dl1_eq || !adev->mixer_ctls.voice_ul_volume) {
mixer_close(adev->mixer);
free(adev);
LOGE("Unable to locate all mixer controls, aborting.");
ALOGE("Unable to locate all mixer controls, aborting.");
return -EINVAL;
}

Expand All @@ -2987,7 +2987,7 @@ static int adev_open(const hw_module_t* module, const char* name,
pthread_mutex_unlock(&adev->lock);
mixer_close(adev->mixer);
free(adev);
LOGE("Unsupported boardtype, aborting.");
ALOGE("Unsupported boardtype, aborting.");
return -EINVAL;
}

Expand Down

0 comments on commit cbd4fae

Please sign in to comment.