From 8a234ebbe9e9299f6ea3de282343c95cd9ce6940 Mon Sep 17 00:00:00 2001 From: Jeongmo Yang Date: Thu, 24 Nov 2022 17:11:39 +0900 Subject: [PATCH] Update element's nickname [Version] 0.10.281 [Issue Type] Update Change-Id: Id2183521f2d7b6bc41fa7eb34ae200090d92abde Signed-off-by: Jeongmo Yang --- packaging/libmm-camcorder.spec | 2 +- src/mm_camcorder_gstcommon.c | 54 +++++++++++++++++----------------- src/mm_camcorder_stillshot.c | 10 +++---- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/packaging/libmm-camcorder.spec b/packaging/libmm-camcorder.spec index e6cf93b..b42dd5a 100755 --- 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.280 +Version: 0.10.281 Release: 0 Group: Multimedia/Libraries License: Apache-2.0 diff --git a/src/mm_camcorder_gstcommon.c b/src/mm_camcorder_gstcommon.c index eac943f..29d4ddb 100644 --- a/src/mm_camcorder_gstcommon.c +++ b/src/mm_camcorder_gstcommon.c @@ -639,9 +639,9 @@ int _mmcamcorder_create_preview_elements(MMHandleType handle) /** * Create child element */ - _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSRC_SRC, videosrc_name, "videosrc_src", element_list, err); + _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSRC_SRC, videosrc_name, "vsrc_s", element_list, err); - _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSRC_CAPS, "capsfilter", "videosrc_caps", element_list, err); + _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSRC_CAPS, "capsfilter", "vsrc_c", element_list, err); /** * This is for "tizencamerasrc" element only. @@ -709,11 +709,11 @@ int _mmcamcorder_create_preview_elements(MMHandleType handle) hcamcorder->conf_ctrl, CONFIGURE_CATEGORY_CTRL_CAMERA, "VideoFilterElement", &videofilt_element, &videofilt_name); if (videofilt_element && videofilt_name) { - _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSRC_FILT, videofilt_name, "videosrc_filt", element_list, err); + _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSRC_FILT, videofilt_name, "vsrc_f", element_list, err); _mmcamcorder_conf_set_value_element_property(sc->element[_MMCAMCORDER_VIDEOSRC_FILT].gst, videofilt_element); } - _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSRC_QUE, "queue", "videosrc_queue", element_list, err); + _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSRC_QUE, "queue", "vsrc_q", element_list, err); if (display_surface_type != MM_DISPLAY_SURFACE_NULL && _mmcamcorder_is_encoded_preview_pixel_format(sc->info_image->preview_format)) { @@ -769,9 +769,9 @@ int _mmcamcorder_create_preview_elements(MMHandleType handle) videoparse_name = __mmcamcorder_get_parser_name(sc->info_image->preview_format); if (videoparse_name) - _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSRC_PARSE, videoparse_name, "videosrc_parse", element_list, err); + _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSRC_PARSE, videoparse_name, "vsrc_p", element_list, err); - _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSRC_DECODE, videodecoder_name_final, "videosrc_decode", element_list, err); + _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSRC_DECODE, videodecoder_name_final, "vsrc_d", element_list, err); _mmcamcorder_conf_set_value_element_property(sc->element[_MMCAMCORDER_VIDEOSRC_DECODE].gst, sc->VideodecoderElement); } @@ -786,7 +786,7 @@ int _mmcamcorder_create_preview_elements(MMHandleType handle) goto pipeline_creation_error; } - _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSINK_QUE, "queue", "videosink_queue", element_list, err); + _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSINK_QUE, "queue", "vsink_q", element_list, err); MMCAM_LOG_INFO("videosink_name: %s", videosink_name); @@ -796,7 +796,7 @@ int _mmcamcorder_create_preview_elements(MMHandleType handle) if (videoconvert_name) { MMCAM_LOG_INFO("videoconvert element name : %s", videoconvert_name); - _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSINK_CLS, videoconvert_name, "videosink_cls", element_list, err); + _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSINK_CLS, videoconvert_name, "vsink_c", element_list, err); } else MMCAM_LOG_ERROR("failed to get videoconvert element name"); } @@ -825,7 +825,7 @@ int _mmcamcorder_create_preview_elements(MMHandleType handle) goto pipeline_creation_error; } } else { - _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSINK_SINK, videosink_name, "videosink_sink", element_list, err); + _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSINK_SINK, videosink_name, "vsink_s", element_list, err); _mmcamcorder_conf_set_value_element_property(sc->element[_MMCAMCORDER_VIDEOSINK_SINK].gst, sc->VideosinkElement); } @@ -973,7 +973,7 @@ int _mmcamcorder_create_audiosrc_bin(MMHandleType handle) MMCAM_LOG_INFO("Audio src name : %s", audiosrc_name); - _MMCAMCORDER_ELEMENT_MAKE(sc, sc->encode_element, _MMCAMCORDER_AUDIOSRC_SRC, audiosrc_name, "audiosrc_src", element_list, err); + _MMCAMCORDER_ELEMENT_MAKE(sc, sc->encode_element, _MMCAMCORDER_AUDIOSRC_SRC, audiosrc_name, "asrc_s", element_list, err); /* set sound stream info */ _mmcamcorder_set_sound_stream_info(sc->encode_element[_MMCAMCORDER_AUDIOSRC_SRC].gst, stream_type, stream_index); @@ -992,9 +992,9 @@ int _mmcamcorder_create_audiosrc_bin(MMHandleType handle) MMCAMCORDER_G_OBJECT_SET(sc->encode_element[_MMCAMCORDER_AUDIOSRC_SRC].gst, "blocksize", blocksize); } - _MMCAMCORDER_ELEMENT_MAKE(sc, sc->encode_element, _MMCAMCORDER_AUDIOSRC_CAPS, "capsfilter", "audiosrc_caps", element_list, err); + _MMCAMCORDER_ELEMENT_MAKE(sc, sc->encode_element, _MMCAMCORDER_AUDIOSRC_CAPS, "capsfilter", "asrc_c", element_list, err); - _MMCAMCORDER_ELEMENT_MAKE(sc, sc->encode_element, _MMCAMCORDER_AUDIOSRC_QUE, "queue", "audiosrc_queue", element_list, err); + _MMCAMCORDER_ELEMENT_MAKE(sc, sc->encode_element, _MMCAMCORDER_AUDIOSRC_QUE, "queue", "asrc_q", element_list, err); MMCAMCORDER_G_OBJECT_SET(sc->encode_element[_MMCAMCORDER_AUDIOSRC_QUE].gst, "max-size-buffers", 0); 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); @@ -1004,7 +1004,7 @@ int _mmcamcorder_create_audiosrc_bin(MMHandleType handle) int depth = 0; const gchar* format_name = NULL; - _MMCAMCORDER_ELEMENT_MAKE(sc, sc->encode_element, _MMCAMCORDER_AUDIOSRC_VOL, "volume", "audiosrc_volume", element_list, err); + _MMCAMCORDER_ELEMENT_MAKE(sc, sc->encode_element, _MMCAMCORDER_AUDIOSRC_VOL, "volume", "asrc_v", element_list, err); if (volume == 0.0) { /* Because data probe of audio src do the same job, it doesn't need to set "mute" here. Already null raw data. */ @@ -1045,7 +1045,7 @@ int _mmcamcorder_create_audiosrc_bin(MMHandleType handle) replay_gain_enable, replay_gain_ref_level); if (replay_gain_enable) { - _MMCAMCORDER_ELEMENT_MAKE(sc, sc->encode_element, _MMCAMCORDER_AUDIOSRC_RGA, "rganalysis", "audiosrc_rga", element_list, err); + _MMCAMCORDER_ELEMENT_MAKE(sc, sc->encode_element, _MMCAMCORDER_AUDIOSRC_RGA, "rganalysis", "asrc_r", element_list, err); MMCAMCORDER_G_OBJECT_SET(sc->encode_element[_MMCAMCORDER_AUDIOSRC_RGA].gst, "reference-level", replay_gain_ref_level); /* If num-tracks is not set, album gain and peak event is not come. */ MMCAMCORDER_G_OBJECT_SET(sc->encode_element[_MMCAMCORDER_AUDIOSRC_RGA].gst, "num-tracks", 1); @@ -1219,9 +1219,9 @@ int _mmcamcorder_create_encodesink_bin(MMHandleType handle, MMCamcorderEncodebin char *caps_str = NULL; /* create appsrc and capsfilter */ - _MMCAMCORDER_ELEMENT_MAKE(sc, sc->encode_element, _MMCAMCORDER_ENCSINK_SRC, "appsrc", "encodesink_src", element_list, err); + _MMCAMCORDER_ELEMENT_MAKE(sc, sc->encode_element, _MMCAMCORDER_ENCSINK_SRC, "appsrc", "esink_s", element_list, err); - _MMCAMCORDER_ELEMENT_MAKE(sc, sc->encode_element, _MMCAMCORDER_ENCSINK_CAPS, "capsfilter", "encodesink_caps", element_list, err); + _MMCAMCORDER_ELEMENT_MAKE(sc, sc->encode_element, _MMCAMCORDER_ENCSINK_CAPS, "capsfilter", "esink_c", element_list, err); /* set appsrc as live source */ MMCAMCORDER_G_OBJECT_SET(sc->encode_element[_MMCAMCORDER_ENCSINK_SRC].gst, "is-live", TRUE); @@ -1231,14 +1231,14 @@ int _mmcamcorder_create_encodesink_bin(MMHandleType handle, MMCamcorderEncodebin /* set capsfilter */ if (profile == MM_CAMCORDER_ENCBIN_PROFILE_VIDEO) { if (_mmcamcorder_is_encoded_preview_pixel_format(sc->info_image->preview_format)) { - MMCAM_LOG_INFO("get pad from videosrc_caps"); + MMCAM_LOG_INFO("get pad from vsrc_c"); pad = gst_element_get_static_pad(sc->element[_MMCAMCORDER_VIDEOSRC_CAPS].gst, "src"); } else { - MMCAM_LOG_INFO("get pad from videosrc_que"); + MMCAM_LOG_INFO("get pad from vsrc_q"); pad = gst_element_get_static_pad(sc->element[_MMCAMCORDER_VIDEOSRC_QUE].gst, "src"); } if (!pad) { - MMCAM_LOG_ERROR("get videosrc_que src pad failed"); + MMCAM_LOG_ERROR("get src pad failed"); err = MM_ERROR_CAMCORDER_RESOURCE_CREATION; goto pipeline_creation_error; } @@ -1322,8 +1322,8 @@ int _mmcamcorder_create_encodesink_bin(MMHandleType handle, MMCamcorderEncodebin g_free(caps_str); caps_str = NULL; - _MMCAMCORDER_ELEMENT_MAKE(sc, sc->encode_element, _MMCAMCORDER_ENCSINK_VSCALE, gst_element_vscale_name, "encodesink_vscale", element_list, err); - _MMCAMCORDER_ELEMENT_MAKE(sc, sc->encode_element, _MMCAMCORDER_ENCSINK_VSCALE_CAPS, "capsfilter", "encodesink_vscale_caps", element_list, err); + _MMCAMCORDER_ELEMENT_MAKE(sc, sc->encode_element, _MMCAMCORDER_ENCSINK_VSCALE, gst_element_vscale_name, "esink_vs", element_list, err); + _MMCAMCORDER_ELEMENT_MAKE(sc, sc->encode_element, _MMCAMCORDER_ENCSINK_VSCALE_CAPS, "capsfilter", "esink_vs_c", element_list, err); MMCAMCORDER_G_OBJECT_SET_POINTER((sc->encode_element[_MMCAMCORDER_ENCSINK_VSCALE_CAPS].gst), "caps", videoscale_caps); @@ -1346,7 +1346,7 @@ int _mmcamcorder_create_encodesink_bin(MMHandleType handle, MMCamcorderEncodebin } _MMCAMCORDER_ELEMENT_MAKE(sc, sc->encode_element, _MMCAMCORDER_ENCSINK_ENCBIN, - "tizenencodebin", "encodesink_encbin", element_list, err); + "tizenencodebin", "esink_e", element_list, err); /* check element availability */ if (profile == MM_CAMCORDER_ENCBIN_PROFILE_IMAGE) { @@ -3174,7 +3174,7 @@ bool _mmcamcorder_recreate_decoder_for_encoded_preview(MMHandleType handle) #endif /* _MMCAMCORDER_RM_SUPPORT */ /* create decoder */ - sc->element[_MMCAMCORDER_VIDEOSRC_DECODE].gst = gst_element_factory_make(videodecoder_name_final, "videosrc_decode"); + sc->element[_MMCAMCORDER_VIDEOSRC_DECODE].gst = gst_element_factory_make(videodecoder_name_final, "vsrc_dec"); if (sc->element[_MMCAMCORDER_VIDEOSRC_DECODE].gst == NULL) { MMCAM_LOG_ERROR("Decoder[%s] creation fail", videodecoder_name_final); return FALSE; @@ -3197,17 +3197,17 @@ bool _mmcamcorder_recreate_decoder_for_encoded_preview(MMHandleType handle) /* link */ if (_MM_GST_ELEMENT_LINK(GST_ELEMENT(sc->element[_MMCAMCORDER_VIDEOSRC_QUE].gst), GST_ELEMENT(sc->element[_MMCAMCORDER_VIDEOSRC_DECODE].gst))) { - MMCAM_LOG_INFO("Link videosrc_queue to decoder OK"); + MMCAM_LOG_INFO("Link vsrc_q to decoder OK"); } else { - MMCAM_LOG_ERROR("Link videosrc_queue to decoder FAILED"); + MMCAM_LOG_ERROR("Link vsrc_q to decoder FAILED"); return FALSE; } if (_MM_GST_ELEMENT_LINK(GST_ELEMENT(sc->element[_MMCAMCORDER_VIDEOSRC_DECODE].gst), GST_ELEMENT(sc->element[_MMCAMCORDER_VIDEOSINK_QUE].gst))) { - MMCAM_LOG_INFO("Link decoder to videosink_queue OK"); + MMCAM_LOG_INFO("Link decoder to vsink_q OK"); } else { - MMCAM_LOG_ERROR("Link decoder to videosink_queue FAILED"); + MMCAM_LOG_ERROR("Link decoder to vsink_q FAILED"); return FALSE; } diff --git a/src/mm_camcorder_stillshot.c b/src/mm_camcorder_stillshot.c index 9fd4391..df2dcd7 100644 --- a/src/mm_camcorder_stillshot.c +++ b/src/mm_camcorder_stillshot.c @@ -207,8 +207,8 @@ static int __mmcamcorder_capture_mode_init_image_pad(MMHandleType handle) return err; } - _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSRC_CAP_CAPS, "capsfilter", "videosrc_cap_caps", element_list, err); - _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSRC_CAP_SINK, "fakesink", "videosrc_cap_sink", element_list, err); + _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSRC_CAP_CAPS, "capsfilter", "vsrc_c_c", element_list, err); + _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSRC_CAP_SINK, "fakesink", "vsrc_c_s", element_list, err); MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSRC_CAP_SINK].gst, "sync", TRUE); MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSRC_CAP_SINK].gst, "async", FALSE); @@ -426,15 +426,15 @@ static int __mmcamcorder_extra_preview_mode_init_pipeline(MMHandleType handle, M hcamcorder->conf_main, CONFIGURE_CATEGORY_MAIN_VIDEO_INPUT, "VideosrcElement", &videosrc_element, &videosrc_name); - _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSRC_EXT_SRC, videosrc_name, "videosrc_ext_src", element_list, err); + _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSRC_EXT_SRC, videosrc_name, "vsrc_e_src", element_list, err); MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSRC_EXT_SRC].gst, "camera-id", hcamcorder->extra_preview.camera_id[0]); _mmcamcorder_conf_set_value_element_property(sc->element[_MMCAMCORDER_VIDEOSRC_EXT_SRC].gst, videosrc_element); } - _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSRC_EXT_CAPS, "capsfilter", "videosrc_ext_caps", element_list, err); - _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSRC_EXT_SINK, "fakesink", "videosrc_ext_sink", element_list, err); + _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSRC_EXT_CAPS, "capsfilter", "vsrc_e_c", element_list, err); + _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSRC_EXT_SINK, "fakesink", "vsrc_e_sink", element_list, err); MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSRC_EXT_SINK].gst, "sync", TRUE); MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSRC_EXT_SINK].gst, "async", FALSE); -- 2.34.1