From dfa299b7a33d41e0215d3917161f4635fc3bd633 Mon Sep 17 00:00:00 2001 From: Jeongmo Yang Date: Wed, 2 Sep 2020 12:31:47 +0900 Subject: [PATCH] Fix typo [Version] 0.10.212 [Issue Type] Typo Change-Id: Ic9f75621ab643fe5cb793639acac0e622b786f6d Signed-off-by: Jeongmo Yang --- packaging/libmm-camcorder.spec | 2 +- src/include/mm_camcorder_audiorec.h | 2 +- src/include/mm_camcorder_videorec.h | 2 +- src/mm_camcorder_audiorec.c | 22 +++++++++++----------- src/mm_camcorder_gstcommon.c | 10 +++++----- src/mm_camcorder_internal.c | 8 ++++---- src/mm_camcorder_stillshot.c | 4 ++-- src/mm_camcorder_videorec.c | 32 ++++++++++++++++---------------- 8 files changed, 41 insertions(+), 41 deletions(-) diff --git a/packaging/libmm-camcorder.spec b/packaging/libmm-camcorder.spec index aa29705..9d82016 100644 --- a/packaging/libmm-camcorder.spec +++ b/packaging/libmm-camcorder.spec @@ -1,6 +1,6 @@ Name: libmm-camcorder Summary: Camera and recorder library -Version: 0.10.211 +Version: 0.10.212 Release: 0 Group: Multimedia/Libraries License: Apache-2.0 diff --git a/src/include/mm_camcorder_audiorec.h b/src/include/mm_camcorder_audiorec.h index 6366fd2..a5b880d 100644 --- a/src/include/mm_camcorder_audiorec.h +++ b/src/include/mm_camcorder_audiorec.h @@ -42,7 +42,7 @@ typedef struct { int iBitDepth; /**< Bit depth */ int iChannels; /**< audio channels */ char *filename; /**< recorded file name */ - gboolean b_commiting; /**< Is it commiting now? */ + gboolean b_committing; /**< Is it committing now? */ gboolean bMuxing; /**< whether muxing */ guint64 filesize; /**< current recorded file size */ guint64 max_size; /**< max recording size */ diff --git a/src/include/mm_camcorder_videorec.h b/src/include/mm_camcorder_videorec.h index b6d845e..87ae32c 100644 --- a/src/include/mm_camcorder_videorec.h +++ b/src/include/mm_camcorder_videorec.h @@ -55,7 +55,7 @@ enum { * MMCamcorder information for video(preview/recording) mode */ typedef struct { - gboolean b_commiting; /**< Is it commiting now? */ + gboolean b_committing; /**< Is it committing now? */ char *filename; /**< recorded filename */ double record_timestamp_ratio; /**< timestamp ratio of video recording for slow/fast motion recording */ double record_motion_rate; /**< motion rate of video recording for slow/fast motion recording */ diff --git a/src/mm_camcorder_audiorec.c b/src/mm_camcorder_audiorec.c index 7b0fa1a..5856eab 100644 --- a/src/mm_camcorder_audiorec.c +++ b/src/mm_camcorder_audiorec.c @@ -437,7 +437,7 @@ _mmcamcorder_audio_command(MMHandleType handle, int command) GstClock *pipe_clock = NULL; int count = 0; - if (info->b_commiting) { + if (info->b_committing) { _mmcam_dbg_warn("now on commiting previous file!!(cmd : %d)", cmd); return MM_ERROR_CAMCORDER_CMD_IS_RUNNING; } @@ -467,7 +467,7 @@ _mmcamcorder_audio_command(MMHandleType handle, int command) } case _MMCamcorder_CMD_CANCEL: - if (info->b_commiting) { + if (info->b_committing) { _mmcam_dbg_warn("now on commiting previous file!!(cmd : %d)", cmd); return MM_ERROR_CAMCORDER_CMD_IS_RUNNING; } @@ -507,12 +507,12 @@ _mmcamcorder_audio_command(MMHandleType handle, int command) guint64 free_space = 0; _mmcam_dbg_log("_MMCamcorder_CMD_COMMIT"); - if (info->b_commiting) { + if (info->b_committing) { _mmcam_dbg_warn("now on commiting previous file!!(cmd : %d)", cmd); return MM_ERROR_CAMCORDER_CMD_IS_RUNNING; } else { _mmcam_dbg_log("_MMCamcorder_CMD_COMMIT : start"); - info->b_commiting = TRUE; + info->b_committing = TRUE; } for (count = 0 ; count <= _MMCAMCORDER_RETRIAL_COUNT ; count++) { @@ -520,7 +520,7 @@ _mmcamcorder_audio_command(MMHandleType handle, int command) break; } else if (count == _MMCAMCORDER_RETRIAL_COUNT) { _mmcam_dbg_err("Commit fail, waited 200 ms, but file size is %"G_GUINT64_FORMAT, info->filesize); - info->b_commiting = FALSE; + info->b_committing = FALSE; return MM_ERROR_CAMCORDER_INVALID_CONDITION; } else { _mmcam_dbg_warn("Waiting for enough audio frame, re-count[%d], file size is %"G_GUINT64_FORMAT, @@ -539,7 +539,7 @@ _mmcamcorder_audio_command(MMHandleType handle, int command) if (audioSrc) { if (gst_element_send_event(audioSrc, gst_event_new_eos()) == FALSE) { _mmcam_dbg_err("send EOS failed"); - info->b_commiting = FALSE; + info->b_committing = FALSE; ret = MM_ERROR_CAMCORDER_INTERNAL; goto _ERR_CAMCORDER_AUDIO_COMMAND; } @@ -550,13 +550,13 @@ _mmcamcorder_audio_command(MMHandleType handle, int command) if (_mmcamcorder_get_state((MMHandleType)hcamcorder) == MM_CAMCORDER_STATE_PAUSED) { ret = _mmcamcorder_gst_set_state(handle, pipeline, GST_STATE_PLAYING); if (ret != MM_ERROR_NONE) { - info->b_commiting = FALSE; + info->b_committing = FALSE; goto _ERR_CAMCORDER_AUDIO_COMMAND; } } } else { _mmcam_dbg_err("No audio stream source"); - info->b_commiting = FALSE; + info->b_committing = FALSE; ret = MM_ERROR_CAMCORDER_INTERNAL; goto _ERR_CAMCORDER_AUDIO_COMMAND; } @@ -564,7 +564,7 @@ _mmcamcorder_audio_command(MMHandleType handle, int command) /* wait until finishing EOS */ _mmcam_dbg_log("Start to wait EOS"); if ((ret = _mmcamcorder_get_eos_message(handle)) != MM_ERROR_NONE) { - info->b_commiting = FALSE; + info->b_committing = FALSE; goto _ERR_CAMCORDER_AUDIO_COMMAND; } break; @@ -649,7 +649,7 @@ int _mmcamcorder_audio_handle_eos(MMHandleType handle) _mmcam_dbg_err("_MMCamcorder_CMD_COMMIT : end"); - info->b_commiting = FALSE; + info->b_committing = FALSE; return TRUE; } @@ -985,7 +985,7 @@ static GstPadProbeReturn __mmcamcorder_audio_dataprobe_record(GstPad *pad, GstPa } /* send message for recording time and recorded file size */ - if (audioinfo->b_commiting == FALSE) { + if (audioinfo->b_committing == FALSE) { audioinfo->filesize += buffer_size; msg.id = MM_MESSAGE_CAMCORDER_RECORDING_STATUS; diff --git a/src/mm_camcorder_gstcommon.c b/src/mm_camcorder_gstcommon.c index d508c3f..6124149 100644 --- a/src/mm_camcorder_gstcommon.c +++ b/src/mm_camcorder_gstcommon.c @@ -555,7 +555,7 @@ int _mmcamcorder_create_preview_elements(MMHandleType handle) if (sc->is_modified_rate) MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst, "high-speed-fps", fps); - /* Set basic infomation of videosrc element */ + /* Set basic information of videosrc element */ _mmcamcorder_conf_set_value_element_property(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst, VideosrcElement); /* Set video device index */ @@ -904,7 +904,7 @@ int _mmcamcorder_create_audiosrc_bin(MMHandleType handle) MMCAMCORDER_G_OBJECT_SET(sc->encode_element[_MMCAMCORDER_AUDIOSRC_QUE].gst, "max-size-bytes", 0); MMCAMCORDER_G_OBJECT_SET(sc->encode_element[_MMCAMCORDER_AUDIOSRC_QUE].gst, "max-size-time", 0); - /* Set basic infomation */ + /* Set basic information */ if (a_enc != MM_AUDIO_CODEC_VORBIS) { int depth = 0; const gchar* format_name = NULL; @@ -2289,11 +2289,11 @@ int _mmcamcorder_get_eos_message(MMHandleType handle) if (hcamcorder->error_code == MM_ERROR_NONE) { if (hcamcorder->type != MM_CAMCORDER_MODE_AUDIO) { mmf_return_val_if_fail(sc->info_video, MM_ERROR_CAMCORDER_NOT_INITIALIZED); - if (sc->info_video->b_commiting) + if (sc->info_video->b_committing) _mmcamcorder_video_handle_eos((MMHandleType)hcamcorder); } else { mmf_return_val_if_fail(sc->info_audio, MM_ERROR_CAMCORDER_NOT_INITIALIZED); - if (sc->info_audio->b_commiting) + if (sc->info_audio->b_committing) _mmcamcorder_audio_handle_eos((MMHandleType)hcamcorder); } } else { @@ -2503,7 +2503,7 @@ bool _mmcamcorder_set_videosrc_rotation(MMHandleType handle, int videosrc_rotate sc = MMF_CAMCORDER_SUBCONTEXT(handle); if (!sc) { - _mmcam_dbg_log("sub context is not initailized"); + _mmcam_dbg_log("sub context is not initialized"); return TRUE; } diff --git a/src/mm_camcorder_internal.c b/src/mm_camcorder_internal.c index 5bb47d4..4c2cc1f 100644 --- a/src/mm_camcorder_internal.c +++ b/src/mm_camcorder_internal.c @@ -2972,7 +2972,7 @@ static GstBusSyncReply __mmcamcorder_gst_handle_sync_audio_error(mmf_camcorder_t static GstBusSyncReply __mmcamcorder_gst_handle_sync_others_error(mmf_camcorder_t *hcamcorder, gint err_code) { - gboolean b_commiting = FALSE; + gboolean b_committing = FALSE; storage_state_e storage_state = STORAGE_STATE_UNMOUNTABLE; _MMCamcorderMsgItem msg; _MMCamcorderSubContext *sc = NULL; @@ -2987,10 +2987,10 @@ static GstBusSyncReply __mmcamcorder_gst_handle_sync_others_error(mmf_camcorder_ if (hcamcorder->type != MM_CAMCORDER_MODE_AUDIO) { mmf_return_val_if_fail(sc->info_video, GST_BUS_PASS); - b_commiting = sc->info_video->b_commiting; + b_committing = sc->info_video->b_committing; } else { mmf_return_val_if_fail(sc->info_audio, GST_BUS_PASS); - b_commiting = sc->info_audio->b_commiting; + b_committing = sc->info_audio->b_committing; } _MMCAMCORDER_LOCK(hcamcorder); @@ -3033,7 +3033,7 @@ static GstBusSyncReply __mmcamcorder_gst_handle_sync_others_error(mmf_camcorder_ break; } - if (b_commiting) { + if (b_committing) { _MMCAMCORDER_SIGNAL(hcamcorder); _MMCAMCORDER_UNLOCK(hcamcorder); } else { diff --git a/src/mm_camcorder_stillshot.c b/src/mm_camcorder_stillshot.c index 723cf73..ca6e28f 100644 --- a/src/mm_camcorder_stillshot.c +++ b/src/mm_camcorder_stillshot.c @@ -2284,7 +2284,7 @@ int __mmcamcorder_set_exif_basic_info(MMHandleType handle, int image_width, int if (str_value && str_val_len > 0) { char *description = strdup(str_value); - _mmcam_dbg_log("desctiption [%s]", str_value); + _mmcam_dbg_log("description [%s]", str_value); if (description) { ret = mm_exif_set_add_entry(ed, EXIF_IFD_0, EXIF_TAG_IMAGE_DESCRIPTION, @@ -2763,7 +2763,7 @@ int __mmcamcorder_set_exif_basic_info(MMHandleType handle, int image_width, int if (irange != NULL) { mm_camcorder_get_attributes(handle, NULL, MMCAM_FILTER_CONTRAST, &value, NULL); - _mmcam_dbg_log("CONTRAST currentt [%d], default [%d]", value, irange->default_value); + _mmcam_dbg_log("CONTRAST current [%d], default [%d]", value, irange->default_value); if (value == irange->default_value) level = MM_VALUE_NORMAL; diff --git a/src/mm_camcorder_videorec.c b/src/mm_camcorder_videorec.c index b7be551..be08f34 100644 --- a/src/mm_camcorder_videorec.c +++ b/src/mm_camcorder_videorec.c @@ -536,7 +536,7 @@ int _mmcamcorder_remove_recorder_pipeline(MMHandleType handle) ret = _mmcamcorder_gst_set_state(handle, sc->encode_element[_MMCAMCORDER_ENCODE_MAIN_PIPE].gst, GST_STATE_NULL); if (ret != MM_ERROR_NONE) { - _mmcam_dbg_err("Faile to change encode main pipeline [0x%x]", ret); + _mmcam_dbg_err("Failed to change encode main pipeline [0x%x]", ret); return ret; } @@ -933,8 +933,8 @@ int _mmcamcorder_video_command(MMHandleType handle, int command) break; case _MMCamcorder_CMD_PAUSE: { - if (info->b_commiting) { - _mmcam_dbg_warn("now on commiting previous file!!(command : %d)", command); + if (info->b_committing) { + _mmcam_dbg_warn("now on committing previous file!!(command : %d)", command); return MM_ERROR_CAMCORDER_CMD_IS_RUNNING; } @@ -974,8 +974,8 @@ int _mmcamcorder_video_command(MMHandleType handle, int command) } case _MMCamcorder_CMD_CANCEL: { - if (info->b_commiting) { - _mmcam_dbg_warn("now on commiting previous file!!(command : %d)", command); + if (info->b_committing) { + _mmcam_dbg_warn("now on committing previous file!!(command : %d)", command); return MM_ERROR_CAMCORDER_CMD_IS_RUNNING; } @@ -1074,12 +1074,12 @@ int _mmcamcorder_video_command(MMHandleType handle, int command) { guint64 free_space; - if (info->b_commiting) { - _mmcam_dbg_err("now on commiting previous file!!(command : %d)", command); + if (info->b_committing) { + _mmcam_dbg_err("now on committing previous file!!(command : %d)", command); return MM_ERROR_CAMCORDER_CMD_IS_RUNNING; } else { _mmcam_dbg_log("_MMCamcorder_CMD_COMMIT : start"); - info->b_commiting = TRUE; + info->b_committing = TRUE; sc->bget_eos = FALSE; } @@ -1096,7 +1096,7 @@ int _mmcamcorder_video_command(MMHandleType handle, int command) if (info->video_frame_count >= _MMCAMCORDER_MINIMUM_FRAME) { _mmcam_dbg_warn("video frames are enough. keep going..."); } else { - info->b_commiting = FALSE; + info->b_committing = FALSE; return MM_ERROR_CAMCORDER_INVALID_CONDITION; } } else { @@ -1116,7 +1116,7 @@ int _mmcamcorder_video_command(MMHandleType handle, int command) if (info->video_frame_count >= _MMCAMCORDER_MINIMUM_FRAME && info->audio_frame_count) { _mmcam_dbg_warn("video/audio frames are enough. keep going..."); } else { - info->b_commiting = FALSE; + info->b_committing = FALSE; return MM_ERROR_CAMCORDER_INVALID_CONDITION; } @@ -1152,13 +1152,13 @@ int _mmcamcorder_video_command(MMHandleType handle, int command) _mmcam_dbg_warn("VIDEO: send eos to appsrc done"); } else { _mmcam_dbg_err("VIDEO: send EOS failed"); - info->b_commiting = FALSE; + info->b_committing = FALSE; ret = MM_ERROR_CAMCORDER_INTERNAL; goto _ERR_CAMCORDER_VIDEO_COMMAND; } } else { _mmcam_dbg_err("No video stream source"); - info->b_commiting = FALSE; + info->b_committing = FALSE; ret = MM_ERROR_CAMCORDER_INTERNAL; goto _ERR_CAMCORDER_VIDEO_COMMAND; } @@ -1168,7 +1168,7 @@ int _mmcamcorder_video_command(MMHandleType handle, int command) _mmcam_dbg_warn("AUDIO: send eos to audiosrc done"); } else { _mmcam_dbg_err("AUDIO: send EOS failed"); - info->b_commiting = FALSE; + info->b_committing = FALSE; ret = MM_ERROR_CAMCORDER_INTERNAL; goto _ERR_CAMCORDER_VIDEO_COMMAND; } @@ -1184,7 +1184,7 @@ int _mmcamcorder_video_command(MMHandleType handle, int command) _mmcam_dbg_log("Start to wait EOS"); ret = _mmcamcorder_get_eos_message(handle); if (ret != MM_ERROR_NONE) { - info->b_commiting = FALSE; + info->b_committing = FALSE; goto _ERR_CAMCORDER_VIDEO_COMMAND; } @@ -1355,7 +1355,7 @@ int _mmcamcorder_video_handle_eos(MMHandleType handle) info->video_frame_count = 0; info->audio_frame_count = 0; info->filesize = 0; - info->b_commiting = FALSE; + info->b_committing = FALSE; /* check recording stop sound */ _mmcamcorder_sound_solo_play_wait(handle); @@ -1506,7 +1506,7 @@ static GstPadProbeReturn __mmcamcorder_video_dataprobe_encoded(GstPad *pad, GstP /* check free space */ ret = _mmcamcorder_get_freespace(hcamcorder->storage_info.type, &free_space); if (ret != 0) { - _mmcam_dbg_err("Error occured. [%d]", ret); + _mmcam_dbg_err("Error occurred. [%d]", ret); if (sc->ferror_count == 2 && sc->ferror_send == FALSE) { sc->ferror_send = TRUE; -- 2.7.4