From 5cf88d7dd2e2ff8ffbd83ba21f0a9b768a7851ef Mon Sep 17 00:00:00 2001 From: "Hyuntae, Kim" Date: Wed, 13 Jan 2016 16:42:37 +0900 Subject: [PATCH] [libmm-streamrecorder] UTC issue fixes Change-Id: I5aed7121f2d9b6ce175ed8406c0f29ead6f5aa8a --- packaging/libmm-streamrecorder.spec | 2 +- src/mm_streamrecorder_attribute.c | 2 +- src/mm_streamrecorder_gstdispatch.c | 5 ---- src/mm_streamrecorder_ini.c | 52 ++++++++++++++++++------------------- src/mm_streamrecorder_recorder.c | 2 -- 5 files changed, 28 insertions(+), 35 deletions(-) diff --git a/packaging/libmm-streamrecorder.spec b/packaging/libmm-streamrecorder.spec index 1a1897f..9d9abb5 100644 --- a/packaging/libmm-streamrecorder.spec +++ b/packaging/libmm-streamrecorder.spec @@ -1,6 +1,6 @@ Name: libmm-streamrecorder Summary: Media Stream Recorder library -Version: 0.0.1 +Version: 0.0.2 Release: 0 Group: Multimedia/Other License: Apache-2.0 diff --git a/src/mm_streamrecorder_attribute.c b/src/mm_streamrecorder_attribute.c index d8bc8fd..40d7c91 100644 --- a/src/mm_streamrecorder_attribute.c +++ b/src/mm_streamrecorder_attribute.c @@ -558,7 +558,7 @@ int _mmstreamrecorder_get_audio_codec_format(MMHandleType handle, const char *na else if (!strcmp(name, "AAC")) codec_index = MM_AUDIO_CODEC_AAC; else if (!strcmp(name, "PCM")) - codec_index = MM_AUDIO_CODEC_PCM; + codec_index = MM_AUDIO_CODEC_WAVE; else if (!strcmp(name, "VORBIS")) codec_index = MM_AUDIO_CODEC_VORBIS; diff --git a/src/mm_streamrecorder_gstdispatch.c b/src/mm_streamrecorder_gstdispatch.c index 45b42f1..32b6b56 100644 --- a/src/mm_streamrecorder_gstdispatch.c +++ b/src/mm_streamrecorder_gstdispatch.c @@ -420,11 +420,6 @@ gboolean _mmstreamrecorder_remove_message_all(MMHandleType handle) hstreamrecorder->msg_data = NULL; } - /* remove idle function for playing capture sound */ - do { - ret = g_idle_remove_by_data(hstreamrecorder); - _mmstreamrec_dbg_log("remove idle function for playing capture sound. ret[%d]", ret); - } while (ret); _MMSTREAMRECORDER_UNLOCK(handle); diff --git a/src/mm_streamrecorder_ini.c b/src/mm_streamrecorder_ini.c index 5b9b3bb..89c4dfa 100644 --- a/src/mm_streamrecorder_ini.c +++ b/src/mm_streamrecorder_ini.c @@ -213,43 +213,43 @@ int _mm_streamrecorder_ini_load(mm_streamrecorder_ini_t *ini) iniparser_freedict(dict); /* dump structure */ - _mmstreamrec_dbg_log("Stream Recorder initial settings.......................................\n"); + _mmstreamrec_dbg_log("[Stream Recorder initial setting][Start]"); /* general */ - _mmstreamrec_dbg_log("encsink_src_islive : %d\n", ini->encsink_src_islive); - _mmstreamrec_dbg_log("retrial_count : %d\n", ini->retrial_count); - _mmstreamrec_dbg_log("minimum_frame : %d\n", ini->minimum_frame); - _mmstreamrec_dbg_log("convert_output_buffer_num : %d\n", ini->convert_output_buffer_num); - _mmstreamrec_dbg_log("reset_pause_time : %d\n", ini->reset_pause_time); - _mmstreamrec_dbg_log("screen_record : %d\n", ini->screen_record); + _mmstreamrec_dbg_log("encsink_src_islive : %d", ini->encsink_src_islive); + _mmstreamrec_dbg_log("retrial_count : %d", ini->retrial_count); + _mmstreamrec_dbg_log("minimum_frame : %d", ini->minimum_frame); + _mmstreamrec_dbg_log("convert_output_buffer_num : %d", ini->convert_output_buffer_num); + _mmstreamrec_dbg_log("reset_pause_time : %d", ini->reset_pause_time); + _mmstreamrec_dbg_log("screen_record : %d", ini->screen_record); /*encodebin */ - _mmstreamrec_dbg_log("encode bin profile : %d\n", ini->encsink_bin_profile); - _mmstreamrec_dbg_log("encode bin auto audio resample property : %d\n", ini->encsink_bin_auto_audio_resample); - _mmstreamrec_dbg_log("encode bin auto colorspace property : %d\n", ini->encsink_bin_auto_colorspace); - _mmstreamrec_dbg_log("encode bin use video toggle property : %d\n", ini->encsink_bin_use_video_toggle); - _mmstreamrec_dbg_log("encode bin auto audio convert property : %d\n", ini->encsink_bin_auto_audio_convert); + _mmstreamrec_dbg_log("encode bin profile : %d", ini->encsink_bin_profile); + _mmstreamrec_dbg_log("encode bin auto audio resample property : %d", ini->encsink_bin_auto_audio_resample); + _mmstreamrec_dbg_log("encode bin auto colorspace property : %d", ini->encsink_bin_auto_colorspace); + _mmstreamrec_dbg_log("encode bin use video toggle property : %d", ini->encsink_bin_use_video_toggle); + _mmstreamrec_dbg_log("encode bin auto audio convert property : %d", ini->encsink_bin_auto_audio_convert); /* pipeline */ - _mmstreamrec_dbg_log("name_of_encodebin_source : %s\n", ini->name_of_encsink_src); - _mmstreamrec_dbg_log("name_of_audio_source : %s\n", ini->name_of_audio_src); - _mmstreamrec_dbg_log("name_of_h264_video_encoder : %s\n", ini->h264_video_encoder); - _mmstreamrec_dbg_log("name_of_h263_video_encoder : %s\n", ini->h263_video_encoder); - _mmstreamrec_dbg_log("name_of_mpeg4_video_encoder : %s\n", ini->mpeg4_video_encoder); - _mmstreamrec_dbg_log("name_of_audio_encoder : %s\n", ini->name_of_encsink_bin_audio_encoder); - _mmstreamrec_dbg_log("name_of_video_converter : %s\n", ini->name_of_encsink_bin_video_converter); - _mmstreamrec_dbg_log("name_of_3GP_muxer : %s\n", ini->name_of_encsink_bin_3GPMUXER); - _mmstreamrec_dbg_log("name_of_MP4_muxer : %s\n", ini->name_of_encsink_bin_MP4MUXER); - _mmstreamrec_dbg_log("name_of_sink : %s\n", ini->name_of_encsink_sink); + _mmstreamrec_dbg_log("name_of_encodebin_source : %s", ini->name_of_encsink_src); + _mmstreamrec_dbg_log("name_of_audio_source : %s", ini->name_of_audio_src); + _mmstreamrec_dbg_log("name_of_h264_video_encoder : %s", ini->h264_video_encoder); + _mmstreamrec_dbg_log("name_of_h263_video_encoder : %s", ini->h263_video_encoder); + _mmstreamrec_dbg_log("name_of_mpeg4_video_encoder : %s", ini->mpeg4_video_encoder); + _mmstreamrec_dbg_log("name_of_audio_encoder : %s", ini->name_of_encsink_bin_audio_encoder); + _mmstreamrec_dbg_log("name_of_video_converter : %s", ini->name_of_encsink_bin_video_converter); + _mmstreamrec_dbg_log("name_of_3GP_muxer : %s", ini->name_of_encsink_bin_3GPMUXER); + _mmstreamrec_dbg_log("name_of_MP4_muxer : %s", ini->name_of_encsink_bin_MP4MUXER); + _mmstreamrec_dbg_log("name_of_sink : %s", ini->name_of_encsink_sink); /* audio parameter */ - _mmstreamrec_dbg_log("audio_frame_minimum_space : %d\n", ini->audio_frame_minimum_space); - _mmstreamrec_dbg_log("audio_frame_wait_time : %d\n", ini->audio_frame_wait_time); + _mmstreamrec_dbg_log("audio_frame_minimum_space : %d", ini->audio_frame_minimum_space); + _mmstreamrec_dbg_log("audio_frame_wait_time : %d", ini->audio_frame_wait_time); /* video parameter */ - _mmstreamrec_dbg_log("video_frame_wait_time : %d\n", ini->video_frame_wait_time); + _mmstreamrec_dbg_log("video_frame_wait_time : %d", ini->video_frame_wait_time); - _mmstreamrec_dbg_log("---------------------------------------------------\n"); + _mmstreamrec_dbg_log("[Stream Recorder initial setting][End]"); loaded = TRUE; diff --git a/src/mm_streamrecorder_recorder.c b/src/mm_streamrecorder_recorder.c index 02cb2b1..94a8cc8 100644 --- a/src/mm_streamrecorder_recorder.c +++ b/src/mm_streamrecorder_recorder.c @@ -502,8 +502,6 @@ int _mmstreamrecorder_create_encodesink_bin(MMHandleType handle, MMStreamRecorde break; } _MMSTREAMRECORDER_ENCODEBIN_ELMGET(sc, _MMSTREAMRECORDER_ENCSINK_VENC, "video-encode", err); - /* _mmstreamrec_dbg_err(" hyuntae log = %p sc->encode_element[_MMSTREAMRECORDER_ENCSINK_VENC].gst = %p" ,sc, sc->encode_element[_MMSTREAMRECORDER_ENCSINK_VENC].gst); */ - /* set color converter size */ MMSTREAMRECORDER_G_OBJECT_SET(sc->encode_element[_MMSTREAMRECORDER_ENCSINK_ENCBIN].gst, "vconv-name", hstreamrecorder->ini.name_of_encsink_bin_video_converter); -- 2.7.4