X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fmm_camcorder_sound.c;h=48abcf87fc6cb5a144b4287d3020ec64b9f8c3d7;hb=16e10db962a3ca708dc86dfcac954bcc40b30360;hp=c4c89fbecb79c6a9f3864d5745b35447c5a3f4f0;hpb=ec7c99e9c3159f29dba210d26b060f51fabca8a3;p=platform%2Fcore%2Fmultimedia%2Flibmm-camcorder.git diff --git a/src/mm_camcorder_sound.c b/src/mm_camcorder_sound.c index c4c89fb..48abcf8 100644 --- a/src/mm_camcorder_sound.c +++ b/src/mm_camcorder_sound.c @@ -34,410 +34,76 @@ /*--------------------------------------------------------------------------------------- | LOCAL VARIABLE DEFINITIONS for internal | ---------------------------------------------------------------------------------------*/ -#define SAMPLE_SOUND_RATE 44100 -#define DEFAULT_ACTIVE_DEVICE 0xffffffff + /*--------------------------------------------------------------------------------------- | LOCAL FUNCTION PROTOTYPES: | ---------------------------------------------------------------------------------------*/ -static void __solo_sound_callback(void *data); - -static void __pulseaudio_play_sample_cb(pa_context *pulse_context, uint32_t stream_index, void *user_data) -{ - SOUND_INFO *info = NULL; - - mmf_return_if_fail(user_data); - - info = (SOUND_INFO *)user_data; - - _mmcam_dbg_log("START - idx : %d", stream_index); - - pa_threaded_mainloop_signal(info->pulse_mainloop, 0); - - _mmcam_dbg_log("DONE"); - - return; -} - -static void __pulseaudio_context_state_cb(pa_context *pulse_context, void *user_data) -{ - int state = 0; - SOUND_INFO *info = NULL; - - mmf_return_if_fail(user_data); - - info = (SOUND_INFO *)user_data; - - state = pa_context_get_state(pulse_context); - switch (state) { - case PA_CONTEXT_READY: - _mmcam_dbg_log("pulseaudio context READY"); - if (info->pulse_context == pulse_context) { - /* Signal */ - _mmcam_dbg_log("pulseaudio send signal"); - pa_threaded_mainloop_signal(info->pulse_mainloop, 0); - } - break; - case PA_CONTEXT_TERMINATED: - if (info->pulse_context == pulse_context) { - /* Signal */ - _mmcam_dbg_log("Context terminated : pulseaudio send signal"); - pa_threaded_mainloop_signal(info->pulse_mainloop, 0); - } - break; - case PA_CONTEXT_UNCONNECTED: - case PA_CONTEXT_CONNECTING: - case PA_CONTEXT_AUTHORIZING: - case PA_CONTEXT_SETTING_NAME: - case PA_CONTEXT_FAILED: - default: - _mmcam_dbg_log("pulseaudio context %p, state %d", - pulse_context, state); - break; - } - - return; -} - -#ifdef _MMCAMCORDER_UPLOAD_SAMPLE -static void __pulseaudio_stream_write_cb(pa_stream *stream, size_t length, void *user_data) -{ - sf_count_t read_length; - short *data; - SOUND_INFO *info = NULL; - - mmf_return_if_fail(user_data); - - info = (SOUND_INFO *)user_data; - - _mmcam_dbg_log("START"); - - data = pa_xmalloc(length); - - read_length = (sf_count_t)(length/pa_frame_size(&(info->sample_spec))); - - if ((sf_readf_short(info->infile, data, read_length)) != read_length) { - pa_xfree(data); - return; - } - - pa_stream_write(stream, data, length, pa_xfree, 0, PA_SEEK_RELATIVE); - - info->sample_length -= length; - - if (info->sample_length <= 0) { - pa_stream_set_write_callback(info->sample_stream, NULL, NULL); - pa_stream_finish_upload(info->sample_stream); - - pa_threaded_mainloop_signal(info->pulse_mainloop, 0); - _mmcam_dbg_log("send signal DONE"); - } - - _mmcam_dbg_log("DONE read_length %d", read_length); - - return; -} - - -static void __pulseaudio_remove_sample_finish_cb(pa_context *pulse_context, int success, void *user_data) -{ - SOUND_INFO *info = NULL; - - mmf_return_if_fail(user_data); - - info = (SOUND_INFO *)user_data; - - _mmcam_dbg_log("START"); - - pa_threaded_mainloop_signal(info->pulse_mainloop, 0); - _mmcam_dbg_log("DONE"); - return; -} -#endif /* _MMCAMCORDER_UPLOAD_SAMPLE */ -#ifdef _MMCAMCORDER_UPLOAD_SAMPLE -gboolean _mmcamcorder_sound_init(MMHandleType handle, char *filename) -#else /* _MMCAMCORDER_UPLOAD_SAMPLE */ gboolean _mmcamcorder_sound_init(MMHandleType handle) -#endif /* _MMCAMCORDER_UPLOAD_SAMPLE */ { - int ret = 0; int sound_enable = TRUE; mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle); SOUND_INFO *info = NULL; - pa_mainloop_api *api = NULL; - int error = PA_ERR_INTERNAL; mmf_return_val_if_fail(hcamcorder, FALSE); - /* check sound play enable */ - ret = mm_camcorder_get_attributes((MMHandleType)hcamcorder, NULL, - "capture-sound-enable", &sound_enable, - NULL); - _mmcam_dbg_log("Capture sound enable %d", sound_enable); - if (!sound_enable) { - _mmcam_dbg_warn("capture sound disabled"); - return FALSE; - } - info = &(hcamcorder->snd_info); - pthread_mutex_lock(&(info->open_mutex)); + g_mutex_lock(&info->open_mutex); + /* check sound state */ if (info->state > _MMCAMCORDER_SOUND_STATE_NONE) { _mmcam_dbg_warn("already initialized [%d]", info->state); - pthread_mutex_unlock(&(info->open_mutex)); + g_mutex_unlock(&info->open_mutex); return TRUE; } -#ifdef _MMCAMCORDER_UPLOAD_SAMPLE - if (info->filename) { - free(info->filename); - info->filename = NULL; - } - - info->filename = strdup(filename); - if (info->filename == NULL) { - _mmcam_dbg_err("strdup failed"); + /* check sound play enable */ + mm_camcorder_get_attributes((MMHandleType)hcamcorder, NULL, + "capture-sound-enable", &sound_enable, + NULL); + _mmcam_dbg_log("Capture sound enable %d", sound_enable); + if (!sound_enable) { + _mmcam_dbg_warn("capture sound disabled"); + g_mutex_unlock(&info->open_mutex); return FALSE; } -#endif /* _MMCAMCORDER_UPLOAD_SAMPLE */ - - pthread_mutex_init(&(info->play_mutex), NULL); - pthread_cond_init(&(info->play_cond), NULL); - -#ifdef _MMCAMCORDER_UPLOAD_SAMPLE - /* read sample */ - memset (&(info->sfinfo), 0, sizeof(SF_INFO)); - info->infile = sf_open(info->filename, SFM_READ, &(info->sfinfo)); - if (!(info->infile)) { - _mmcam_dbg_err("Failed to open sound file"); - goto SOUND_INIT_ERROR; - } -#endif /* _MMCAMCORDER_UPLOAD_SAMPLE */ - - /** - * Init Pulseaudio thread - */ - /* create pulseaudio mainloop */ - info->pulse_mainloop = pa_threaded_mainloop_new(); - if (info->pulse_mainloop == NULL) { - _mmcam_dbg_err("pa_threaded_mainloop_new failed"); - goto SOUND_INIT_ERROR; - } - - /* start PA mainloop */ - ret = pa_threaded_mainloop_start(info->pulse_mainloop); - if (ret < 0) { - _mmcam_dbg_err("pa_threaded_mainloop_start failed"); - goto SOUND_INIT_ERROR; - } - - /* lock pulseaudio thread */ - pa_threaded_mainloop_lock(info->pulse_mainloop); - - /* get pulseaudio api */ - api = pa_threaded_mainloop_get_api(info->pulse_mainloop); - if (api == NULL) { - _mmcam_dbg_err("pa_threaded_mainloop_get_api failed"); - pa_threaded_mainloop_unlock(info->pulse_mainloop); - goto SOUND_INIT_ERROR; - } - - /* create pulseaudio context */ - info->pulse_context = pa_context_new(api, NULL); - if (info->pulse_context == NULL) { - _mmcam_dbg_err("pa_context_new failed"); - pa_threaded_mainloop_unlock(info->pulse_mainloop); - goto SOUND_INIT_ERROR; - } - - /* set pulseaudio context callback */ - pa_context_set_state_callback(info->pulse_context, __pulseaudio_context_state_cb, info); - - if (pa_context_connect(info->pulse_context, NULL, PA_CONTEXT_NOAUTOSPAWN, NULL) < 0) { - _mmcam_dbg_err("pa_context_connect error"); - } - - /* wait READY state of pulse context */ - while (TRUE) { - pa_context_state_t state = pa_context_get_state(info->pulse_context); - - _mmcam_dbg_log("pa context state is now %d", state); - - if (!PA_CONTEXT_IS_GOOD (state)) { - _mmcam_dbg_log("connection failed"); - break; - } - - if (state == PA_CONTEXT_READY) { - _mmcam_dbg_log("pa context READY"); - break; - } - - /* Wait until the context is ready */ - _mmcam_dbg_log("waiting.................."); - pa_threaded_mainloop_wait(info->pulse_mainloop); - _mmcam_dbg_log("waiting DONE. check again..."); - } - - /* unlock pulseaudio thread */ - pa_threaded_mainloop_unlock(info->pulse_mainloop); - -#ifdef _MMCAMCORDER_UPLOAD_SAMPLE - /** - * Upload sample - */ - if (pa_sndfile_read_sample_spec(info->infile, &(info->sample_spec)) < 0) { - _mmcam_dbg_err("Failed to determine sample specification from file"); - goto SOUND_INIT_ERROR; - } - - info->sample_spec.format = PA_SAMPLE_S16LE; - - if (pa_sndfile_read_channel_map(info->infile, &(info->channel_map)) < 0) { - pa_channel_map_init_extend(&(info->channel_map), info->sample_spec.channels, PA_CHANNEL_MAP_DEFAULT); - - if (info->sample_spec.channels > 2) { - _mmcam_dbg_warn("Failed to determine sample specification from file"); - } - } - - info->sample_length = (size_t)info->sfinfo.frames * pa_frame_size(&(info->sample_spec)); - - pa_threaded_mainloop_lock(info->pulse_mainloop); - - /* prepare uploading */ - info->sample_stream = pa_stream_new(info->pulse_context, SAMPLE_SOUND_NAME, &(info->sample_spec), NULL); - /* set stream write callback */ - pa_stream_set_write_callback(info->sample_stream, __pulseaudio_stream_write_cb, info); - /* upload sample (ASYNC) */ - pa_stream_connect_upload(info->sample_stream, info->sample_length); - /* wait for upload completion */ - pa_threaded_mainloop_wait(info->pulse_mainloop); - pa_threaded_mainloop_unlock(info->pulse_mainloop); - - /* close sndfile */ - sf_close(info->infile); - info->infile = NULL; -#else /* _MMCAMCORDER_UPLOAD_SAMPLE */ - if (info->sample_stream) { - pa_stream_connect_playback(info->sample_stream, NULL, NULL, 0, NULL, NULL); - - for (;;) { - pa_stream_state_t state = pa_stream_get_state(info->sample_stream); - - if (state == PA_STREAM_READY) { - _mmcam_dbg_warn("device READY done"); - break; - } - - if (!PA_STREAM_IS_GOOD(state)) { - error = pa_context_errno(info->pulse_context); - _mmcam_dbg_err("pa context state is not good, %d", error); - break; - } - - /* Wait until the stream is ready */ - pa_threaded_mainloop_wait(info->pulse_mainloop); - } + /* check shutter sound policy and status of system */ + if (hcamcorder->shutter_sound_policy == VCONFKEY_CAMERA_SHUTTER_SOUND_POLICY_OFF && + hcamcorder->sub_context->info_image->sound_status == FALSE) { + _mmcam_dbg_warn("skip sound init : Sound Policy OFF and Silent status"); + g_mutex_unlock(&info->open_mutex); + return FALSE; } -#endif /* _MMCAMCORDER_UPLOAD_SAMPLE */ - - //info->volume_type = PA_TIZEN_AUDIO_VOLUME_TYPE_FIXED; - info->volume_level = 0; info->state = _MMCAMCORDER_SOUND_STATE_INIT; _mmcam_dbg_log("init DONE"); - pthread_mutex_unlock(&(info->open_mutex)); + g_mutex_unlock(&info->open_mutex); return TRUE; - -SOUND_INIT_ERROR: - -#ifdef _MMCAMCORDER_UPLOAD_SAMPLE - /** - * Release allocated resources - */ - if (info->filename) { - free(info->filename); - info->filename = NULL; - } -#endif /* _MMCAMCORDER_UPLOAD_SAMPLE */ - - /* remove pulse mainloop */ - if (info->pulse_mainloop) { - pa_threaded_mainloop_lock(info->pulse_mainloop); - - /* remove pulse context */ - if (info->pulse_context) { -#ifdef _MMCAMCORDER_UPLOAD_SAMPLE - /* remove uploaded sample */ - if (info->sample_stream) { - pa_threaded_mainloop_lock(info->pulse_mainloop); - - /* Remove sample (ASYNC) */ - pa_operation_unref(pa_context_remove_sample(info->pulse_context, SAMPLE_SOUND_NAME, __pulseaudio_remove_sample_finish_cb, info)); - - /* Wait for async operation */ - pa_threaded_mainloop_wait(info->pulse_mainloop); - } -#else /* _MMCAMCORDER_UPLOAD_SAMPLE */ - /* release sample stream */ - if (info->sample_stream) { - pa_stream_disconnect(info->sample_stream); - pa_stream_unref(info->sample_stream); - info->sample_stream = NULL; - } -#endif /* _MMCAMCORDER_UPLOAD_SAMPLE */ - - /* Make sure we don't get any further callbacks */ - pa_context_set_state_callback(info->pulse_context, NULL, NULL); - - pa_context_disconnect(info->pulse_context); - pa_context_unref(info->pulse_context); - info->pulse_context = NULL; - } - - pa_threaded_mainloop_unlock(info->pulse_mainloop); - - pa_threaded_mainloop_stop(info->pulse_mainloop); - pa_threaded_mainloop_free(info->pulse_mainloop); - info->pulse_mainloop = NULL; - } - - /* remove mutex and cond */ - pthread_mutex_destroy(&(info->play_mutex)); - pthread_cond_destroy(&(info->play_cond)); - - pthread_mutex_unlock(&(info->open_mutex)); - - return FALSE; } gboolean _mmcamcorder_sound_play(MMHandleType handle, const char *sample_name, gboolean sync_play) { int sound_enable = TRUE; - int gain_type = VOLUME_GAIN_SHUTTER1; + const char *volume_gain = NULL; mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle); SOUND_INFO *info = NULL; -/* - pa_operation *pulse_op = NULL; -*/ mmf_return_val_if_fail(hcamcorder && sample_name, FALSE); /* check sound play enable */ mm_camcorder_get_attributes((MMHandleType)hcamcorder, NULL, - "capture-sound-enable", &sound_enable, - NULL); + "capture-sound-enable", &sound_enable, + NULL); _mmcam_dbg_log("Capture sound enable %d", sound_enable); if (!sound_enable) { _mmcam_dbg_warn("capture sound disabled"); @@ -446,58 +112,25 @@ gboolean _mmcamcorder_sound_play(MMHandleType handle, const char *sample_name, g info = &(hcamcorder->snd_info); - pthread_mutex_lock(&(info->open_mutex)); + g_mutex_lock(&info->open_mutex); if (info->state < _MMCAMCORDER_SOUND_STATE_INIT) { _mmcam_dbg_log("not initialized state:[%d]", info->state); - pthread_mutex_unlock(&(info->open_mutex)); + g_mutex_unlock(&info->open_mutex); return FALSE; } - if (!strcmp(sample_name, _MMCAMCORDER_SAMPLE_SOUND_NAME_CAPTURE)) { - gain_type = VOLUME_GAIN_SHUTTER2; - } else if (!strcmp(sample_name, _MMCAMCORDER_SAMPLE_SOUND_NAME_REC_STOP)) { - gain_type = VOLUME_GAIN_CAMCORDING; - } + if (!strcmp(sample_name, _MMCAMCORDER_SAMPLE_SOUND_NAME_CAPTURE02)) + volume_gain = "shutter2"; + else if (!strcmp(sample_name, _MMCAMCORDER_SAMPLE_SOUND_NAME_REC_STOP)) + volume_gain = "camcording"; _mmcam_dbg_log("Play start - sample name [%s]", sample_name); - if (sync_play) { - pa_threaded_mainloop_lock(info->pulse_mainloop); -/* - pulse_op = pa_ext_policy_play_sample(info->pulse_context, - sample_name, - info->volume_type, - gain_type, - info->volume_level, - __pulseaudio_play_sample_cb, - info); -*/ - _mmcam_dbg_log("wait for signal"); - pa_threaded_mainloop_wait(info->pulse_mainloop); - _mmcam_dbg_log("received signal"); - - pa_threaded_mainloop_unlock(info->pulse_mainloop); - } else { -/* - pulse_op = pa_ext_policy_play_sample(info->pulse_context, - sample_name, - info->volume_type, - gain_type, - info->volume_level, - NULL, - NULL); -*/ - } - -/* - if (pulse_op) { - pa_operation_unref(pulse_op); - pulse_op = NULL; - } -*/ + _mmcamcorder_send_sound_play_message(hcamcorder->gdbus_conn, + &hcamcorder->gdbus_info_sound, sample_name, "system", volume_gain, sync_play); - pthread_mutex_unlock(&(info->open_mutex)); + g_mutex_unlock(&info->open_mutex); _mmcam_dbg_log("Done"); @@ -516,198 +149,60 @@ gboolean _mmcamcorder_sound_finalize(MMHandleType handle) _mmcam_dbg_err("START"); - pthread_mutex_lock(&(info->open_mutex)); + g_mutex_lock(&info->open_mutex); if (info->state < _MMCAMCORDER_SOUND_STATE_INIT) { _mmcam_dbg_warn("not initialized"); - pthread_mutex_unlock(&(info->open_mutex)); + g_mutex_unlock(&info->open_mutex); return TRUE; } - pa_threaded_mainloop_lock(info->pulse_mainloop); - -#ifdef _MMCAMCORDER_UPLOAD_SAMPLE - /** - * Remove sample - */ - _mmcam_dbg_log("remove sample"); - - /* Remove sample (ASYNC) */ - pa_operation_unref(pa_context_remove_sample(info->pulse_context, SAMPLE_SOUND_NAME, __pulseaudio_remove_sample_finish_cb, info)); - - /* Wait for async operation */ - pa_threaded_mainloop_wait(info->pulse_mainloop); -#else /* _MMCAMCORDER_UPLOAD_SAMPLE */ - if (info->sample_stream) { - pa_stream_disconnect(info->sample_stream); - pa_stream_unref(info->sample_stream); - info->sample_stream = NULL; - } -#endif /* _MMCAMCORDER_UPLOAD_SAMPLE */ - - /** - * Release pulseaudio thread - */ - _mmcam_dbg_log("release pulseaudio thread"); - - pa_context_disconnect(info->pulse_context); - - /* Make sure we don't get any further callbacks */ - pa_context_set_state_callback(info->pulse_context, NULL, NULL); - - pa_context_unref(info->pulse_context); - info->pulse_context = NULL; - - pa_threaded_mainloop_unlock(info->pulse_mainloop); - - pa_threaded_mainloop_stop(info->pulse_mainloop); - pa_threaded_mainloop_free(info->pulse_mainloop); - info->pulse_mainloop = NULL; - -#ifdef _MMCAMCORDER_UPLOAD_SAMPLE - if (info->filename) { - free(info->filename); - info->filename = NULL; - } -#endif /* _MMCAMCORDER_UPLOAD_SAMPLE */ - info->state = _MMCAMCORDER_SOUND_STATE_NONE; - /* release mutex and cond */ - _mmcam_dbg_log("release play_mutex/cond"); - pthread_mutex_destroy(&(info->play_mutex)); - pthread_cond_destroy(&(info->play_cond)); - - pthread_mutex_unlock(&(info->open_mutex)); - _mmcam_dbg_err("DONE"); + g_mutex_unlock(&info->open_mutex); + return TRUE; } -void _mmcamcorder_sound_solo_play(MMHandleType handle, const char* filepath, gboolean sync_play) +int _mmcamcorder_sound_solo_play(MMHandleType handle, const char *sample_name, gboolean sync_play) { - mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle); - - int sound_handle = 0; - int ret = MM_ERROR_NONE; int sound_enable = TRUE; - int sound_played = FALSE; - int gain_type = VOLUME_GAIN_SHUTTER1; - mmf_return_if_fail(filepath && hcamcorder); - - _mmcam_dbg_log("START : %s", filepath); - - _mmcamcorder_sound_solo_play_wait(handle); + mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle); - ret = pthread_mutex_trylock(&(hcamcorder->sound_lock)); - if (ret != 0) { - _mmcam_dbg_warn("g_mutex_trylock failed.[%s]", strerror(ret)); - return; - } + mmf_return_val_if_fail(hcamcorder && sample_name, FALSE); - /* check filename to set gain_type */ - if (!strcmp(filepath, _MMCAMCORDER_FILEPATH_CAPTURE_SND) || - !strcmp(filepath, _MMCAMCORDER_FILEPATH_REC_START_SND)) { - if (!strcmp(filepath, _MMCAMCORDER_FILEPATH_REC_START_SND)) { - gain_type = VOLUME_GAIN_CAMCORDING; - } else { - gain_type = VOLUME_GAIN_SHUTTER1; - } - } else if (!strcmp(filepath, _MMCAMCORDER_FILEPATH_CAPTURE2_SND)) { - gain_type = VOLUME_GAIN_SHUTTER2; - } else if (!strcmp(filepath, _MMCAMCORDER_FILEPATH_REC_STOP_SND)) { - gain_type = VOLUME_GAIN_CAMCORDING; - } + _mmcam_dbg_log("START : [%s]", sample_name); - _mmcam_dbg_log("gain type 0x%x", gain_type); + _mmcamcorder_sound_solo_play_wait(handle); - ret = mm_camcorder_get_attributes((MMHandleType)hcamcorder, NULL, - "capture-sound-enable", &sound_enable, - NULL); + /* check sound play enable */ + mm_camcorder_get_attributes((MMHandleType)hcamcorder, NULL, + "capture-sound-enable", &sound_enable, + NULL); _mmcam_dbg_log("Capture sound enable %d", sound_enable); - if (!sound_enable) { - /* send capture sound completed message */ - pthread_mutex_unlock(&(hcamcorder->sound_lock)); - return; + _mmcam_dbg_warn("capture sound disabled"); + return FALSE; } + _mmcam_dbg_log("Play start - sample name [%s]", sample_name); if (hcamcorder->shutter_sound_policy == VCONFKEY_CAMERA_SHUTTER_SOUND_POLICY_ON || - hcamcorder->sub_context->info_image->sound_status) { - ret = mm_sound_play_sound(filepath, VOLUME_TYPE_FIXED | gain_type, - (mm_sound_stop_callback_func)__solo_sound_callback, (void*)hcamcorder, &sound_handle); - sound_played = TRUE; - } else { - _mmcam_dbg_warn("skip shutter sound"); - } - - _mmcam_dbg_log("sync_play %d, sound_played %d, ret 0x%x", sync_play, sound_played, ret); - - if (ret != MM_ERROR_NONE) { - _mmcam_dbg_err( "Capture sound play FAILED.[%x]", ret ); - } else { - if (sound_played) { - /* increase capture sound count */ - hcamcorder->capture_sound_count++; - } - - /* wait for sound completed signal */ - if (sync_play && sound_played) { - struct timespec timeout; - struct timeval tv; - - gettimeofday( &tv, NULL ); - timeout.tv_sec = tv.tv_sec + 2; - timeout.tv_nsec = tv.tv_usec * 1000; - - _mmcam_dbg_log("Wait for signal"); - - if (!pthread_cond_timedwait(&(hcamcorder->sound_cond), &(hcamcorder->sound_lock), &timeout)) { - _mmcam_dbg_log("signal received."); - } else { - _mmcam_dbg_warn("capture sound play timeout."); - if (sound_handle > 0) { - mm_sound_stop_sound(sound_handle); - } - } - } - } - - pthread_mutex_unlock(&(hcamcorder->sound_lock)); - - _mmcam_dbg_log("DONE"); - - return; -} - -static void __solo_sound_callback(void *data) -{ - mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(data); - - mmf_return_if_fail(hcamcorder); - - _mmcam_dbg_log("START"); - - /* decrease capture sound count */ - pthread_mutex_lock(&(hcamcorder->sound_lock)); - if (hcamcorder->capture_sound_count > 0) { - hcamcorder->capture_sound_count--; + hcamcorder->sub_context->info_image->sound_status) { + _mmcamcorder_send_sound_play_message(hcamcorder->gdbus_conn, + &hcamcorder->gdbus_info_solo_sound, sample_name, "system", "shutter1", sync_play); } else { - _mmcam_dbg_warn("invalid capture_sound_count %d, reset count", hcamcorder->capture_sound_count); - hcamcorder->capture_sound_count = 0; + _mmcam_dbg_warn("skip shutter sound : sound policy %d, sound status %d", + hcamcorder->shutter_sound_policy, hcamcorder->sub_context->info_image->sound_status); } - pthread_mutex_unlock(&(hcamcorder->sound_lock)); - - _mmcam_dbg_log("Signal SEND"); - pthread_cond_broadcast(&(hcamcorder->sound_cond)); - _mmcam_dbg_log("DONE"); + _mmcam_dbg_log("Done"); - return; + return TRUE; } @@ -720,26 +215,26 @@ void _mmcamcorder_sound_solo_play_wait(MMHandleType handle) _mmcam_dbg_log("START"); /* check playing sound count */ - pthread_mutex_lock(&(hcamcorder->sound_lock)); - if (hcamcorder->capture_sound_count > 0) { - struct timespec timeout; - struct timeval tv; + g_mutex_lock(&hcamcorder->gdbus_info_solo_sound.sync_mutex); - gettimeofday( &tv, NULL ); - timeout.tv_sec = tv.tv_sec + 2; - timeout.tv_nsec = tv.tv_usec * 1000; + if (hcamcorder->gdbus_info_solo_sound.is_playing) { + gint64 end_time = 0; _mmcam_dbg_log("Wait for signal"); - if (!pthread_cond_timedwait(&(hcamcorder->sound_cond), &(hcamcorder->sound_lock), &timeout)) { + end_time = g_get_monotonic_time() + (2 * G_TIME_SPAN_SECOND); + + if (g_cond_wait_until(&hcamcorder->gdbus_info_solo_sound.sync_cond, + &hcamcorder->gdbus_info_solo_sound.sync_mutex, end_time)) { _mmcam_dbg_log("signal received."); } else { _mmcam_dbg_warn("capture sound play timeout."); } } else { - _mmcam_dbg_warn("no playing sound - count %d", hcamcorder->capture_sound_count); + _mmcam_dbg_warn("no playing sound"); } - pthread_mutex_unlock(&(hcamcorder->sound_lock)); + + g_mutex_unlock(&hcamcorder->gdbus_info_solo_sound.sync_mutex); _mmcam_dbg_log("DONE");