diff options
Diffstat (limited to 'audio')
| -rwxr-xr-x | audio/audio_hw.c | 11 | ||||
| -rwxr-xr-x | audio/ril_interface.c | 13 | ||||
| -rwxr-xr-x | audio/ril_interface.h | 1 |
3 files changed, 6 insertions, 19 deletions
diff --git a/audio/audio_hw.c b/audio/audio_hw.c index 0ba9a41..1488db8 100755 --- a/audio/audio_hw.c +++ b/audio/audio_hw.c @@ -887,7 +887,6 @@ static void select_mode(struct tuna_audio_device *adev) adev->devices &= ~AUDIO_DEVICE_OUT_SPEAKER; select_output_device(adev); start_call(adev); - ril_set_call_clock_sync(&adev->ril, SOUND_CLOCK_START); adev_set_voice_volume(&adev->hw_device, adev->voice_volume); adev->in_call = 1; } @@ -1250,7 +1249,7 @@ static int get_playback_delay(struct tuna_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; } @@ -1764,7 +1763,7 @@ static void get_capture_delay(struct tuna_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, @@ -1778,7 +1777,7 @@ static int32_t update_echo_reference(struct tuna_stream_in *in, size_t frames) struct echo_reference_buffer b; b.delay_ns = 0; - 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) { @@ -1797,7 +1796,7 @@ static int32_t update_echo_reference(struct tuna_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); } @@ -1984,7 +1983,7 @@ static ssize_t process_frames(struct tuna_stream_in *in, void* buffer, ssize_t f 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, diff --git a/audio/ril_interface.c b/audio/ril_interface.c index 4e1e2a1..cee6452 100755 --- a/audio/ril_interface.c +++ b/audio/ril_interface.c @@ -36,7 +36,6 @@ int (*_ril_is_connected)(void *); int (*_ril_disconnect)(void *); int (*_ril_set_call_volume)(void *, enum ril_sound_type, int); int (*_ril_set_call_audio_path)(void *, enum ril_audio_path); -int (*_ril_set_call_clock_sync)(void *, enum ril_clock_state); int (*_ril_register_unsolicited_handler)(void *, int, void *); int (*_ril_get_wb_amr)(void *, void *); @@ -105,7 +104,6 @@ int ril_open(struct ril_handle *ril) _ril_disconnect = dlsym(ril->handle, "Disconnect_RILD"); _ril_set_call_volume = dlsym(ril->handle, "SetCallVolume"); _ril_set_call_audio_path = dlsym(ril->handle, "SetCallAudioPath"); - _ril_set_call_clock_sync = dlsym(ril->handle, "SetCallClockSync"); _ril_register_unsolicited_handler = dlsym(ril->handle, "RegisterUnsolicitedHandler"); /* since this function is not supported in all RILs, don't require it */ @@ -113,8 +111,7 @@ int ril_open(struct ril_handle *ril) if (!_ril_open_client || !_ril_close_client || !_ril_connect || !_ril_is_connected || !_ril_disconnect || !_ril_set_call_volume || - !_ril_set_call_audio_path || !_ril_set_call_clock_sync || - !_ril_register_unsolicited_handler) { + !_ril_set_call_audio_path || !_ril_register_unsolicited_handler) { LOGE("Cannot get symbols from '%s'", RIL_CLIENT_LIBPATH); dlclose(ril->handle); return -1; @@ -173,11 +170,3 @@ int ril_set_call_audio_path(struct ril_handle *ril, enum ril_audio_path path) return _ril_set_call_audio_path(ril->client, path); } - -int ril_set_call_clock_sync(struct ril_handle *ril, enum ril_clock_state state) -{ - if (ril_connect_if_required(ril)) - return 0; - - return _ril_set_call_clock_sync(ril->client, state); -} diff --git a/audio/ril_interface.h b/audio/ril_interface.h index 676772c..2ea83f8 100755 --- a/audio/ril_interface.h +++ b/audio/ril_interface.h @@ -66,7 +66,6 @@ int ril_close(struct ril_handle *ril); int ril_set_call_volume(struct ril_handle *ril, enum ril_sound_type sound_type, float volume); int ril_set_call_audio_path(struct ril_handle *ril, enum ril_audio_path path); -int ril_set_call_clock_sync(struct ril_handle *ril, enum ril_clock_state state); void ril_register_set_wb_amr_callback(void *function, void *data); #endif |