From ab12fa32a521a46d043dfceb3b933d3e015f3a58 Mon Sep 17 00:00:00 2001 From: Jeongmo Yang Date: Mon, 24 Oct 2022 12:52:10 +0900 Subject: [PATCH] Replace "FILT" in pipeline enums by "CAPS" [Version] 0.10.275 [Issue Type] Update Change-Id: I31bedf430a03f06895b443528cef9defb3f9af14 Signed-off-by: Jeongmo Yang --- packaging/libmm-camcorder.spec | 2 +- src/include/mm_camcorder_internal.h | 14 ++++++------ src/mm_camcorder_gstcommon.c | 34 ++++++++++++++--------------- src/mm_camcorder_stillshot.c | 22 +++++++++---------- src/mm_camcorder_videorec.c | 14 ++++++------ 5 files changed, 43 insertions(+), 43 deletions(-) diff --git a/packaging/libmm-camcorder.spec b/packaging/libmm-camcorder.spec index f7a66ab..293423f 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.274 +Version: 0.10.275 Release: 0 Group: Multimedia/Libraries License: Apache-2.0 diff --git a/src/include/mm_camcorder_internal.h b/src/include/mm_camcorder_internal.h index 3c2dfd9..40227d1 100644 --- a/src/include/mm_camcorder_internal.h +++ b/src/include/mm_camcorder_internal.h @@ -538,18 +538,18 @@ typedef enum { /* Pipeline element of Video input */ _MMCAMCORDER_VIDEOSRC_SRC, - _MMCAMCORDER_VIDEOSRC_FILT, + _MMCAMCORDER_VIDEOSRC_CAPS, _MMCAMCORDER_VIDEOSRC_QUE, _MMCAMCORDER_VIDEOSRC_PARSE, _MMCAMCORDER_VIDEOSRC_DECODE, /* Pipeline element of image capture */ - _MMCAMCORDER_VIDEOSRC_CAP_FILT, + _MMCAMCORDER_VIDEOSRC_CAP_CAPS, _MMCAMCORDER_VIDEOSRC_CAP_SINK, /* Pipeline element of extra preview */ _MMCAMCORDER_VIDEOSRC_EXT_SRC, - _MMCAMCORDER_VIDEOSRC_EXT_FILT, + _MMCAMCORDER_VIDEOSRC_EXT_CAPS, _MMCAMCORDER_VIDEOSRC_EXT_SINK, /* Pipeline element of Video output */ @@ -573,7 +573,7 @@ typedef enum { /* Pipeline element of Audio input */ _MMCAMCORDER_AUDIOSRC_BIN, _MMCAMCORDER_AUDIOSRC_SRC, - _MMCAMCORDER_AUDIOSRC_FILT, + _MMCAMCORDER_AUDIOSRC_CAPS, _MMCAMCORDER_AUDIOSRC_QUE, _MMCAMCORDER_AUDIOSRC_CONV, _MMCAMCORDER_AUDIOSRC_VOL, @@ -582,7 +582,7 @@ typedef enum { /* Pipeline element of Encodebin */ _MMCAMCORDER_ENCSINK_BIN, _MMCAMCORDER_ENCSINK_SRC, - _MMCAMCORDER_ENCSINK_FILT, + _MMCAMCORDER_ENCSINK_CAPS, _MMCAMCORDER_ENCSINK_ENCBIN, _MMCAMCORDER_ENCSINK_AQUE, _MMCAMCORDER_ENCSINK_CONV, @@ -590,14 +590,14 @@ typedef enum { _MMCAMCORDER_ENCSINK_AENC_QUE, _MMCAMCORDER_ENCSINK_VQUE, _MMCAMCORDER_ENCSINK_VSCALE, - _MMCAMCORDER_ENCSINK_VSCALE_FILT, + _MMCAMCORDER_ENCSINK_VSCALE_CAPS, _MMCAMCORDER_ENCSINK_VCONV, _MMCAMCORDER_ENCSINK_VENC, _MMCAMCORDER_ENCSINK_VENC_QUE, _MMCAMCORDER_ENCSINK_ITOG, _MMCAMCORDER_ENCSINK_ICROP, _MMCAMCORDER_ENCSINK_ISCALE, - _MMCAMCORDER_ENCSINK_IFILT, + _MMCAMCORDER_ENCSINK_ICAPS, _MMCAMCORDER_ENCSINK_IQUE, _MMCAMCORDER_ENCSINK_IENC, _MMCAMCORDER_ENCSINK_MUX, diff --git a/src/mm_camcorder_gstcommon.c b/src/mm_camcorder_gstcommon.c index 997e77f..c34e404 100644 --- a/src/mm_camcorder_gstcommon.c +++ b/src/mm_camcorder_gstcommon.c @@ -638,7 +638,7 @@ int _mmcamcorder_create_preview_elements(MMHandleType handle) */ _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSRC_SRC, videosrc_name, "videosrc_src", element_list, err); - _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSRC_FILT, "capsfilter", "videosrc_filter", element_list, err); + _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSRC_CAPS, "capsfilter", "videosrc_filter", element_list, err); /** * This is for "tizencamerasrc" element only. @@ -848,9 +848,9 @@ int _mmcamcorder_create_preview_elements(MMHandleType handle) pipeline_creation_error: _MMCAMCORDER_ELEMENT_REMOVE(sc->element, _MMCAMCORDER_VIDEOSRC_SRC); - _MMCAMCORDER_ELEMENT_REMOVE(sc->element, _MMCAMCORDER_VIDEOSRC_FILT); + _MMCAMCORDER_ELEMENT_REMOVE(sc->element, _MMCAMCORDER_VIDEOSRC_CAPS); _MMCAMCORDER_ELEMENT_REMOVE(sc->element, _MMCAMCORDER_VIDEOSRC_QUE); - _MMCAMCORDER_ELEMENT_REMOVE(sc->element, _MMCAMCORDER_VIDEOSRC_CAP_FILT); + _MMCAMCORDER_ELEMENT_REMOVE(sc->element, _MMCAMCORDER_VIDEOSRC_CAP_CAPS); _MMCAMCORDER_ELEMENT_REMOVE(sc->element, _MMCAMCORDER_VIDEOSRC_CAP_SINK); _MMCAMCORDER_ELEMENT_REMOVE(sc->element, _MMCAMCORDER_VIDEOSRC_DECODE); _MMCAMCORDER_ELEMENT_REMOVE(sc->element, _MMCAMCORDER_VIDEOSINK_QUE); @@ -978,7 +978,7 @@ 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_FILT, "capsfilter", "audiosrc_capsfilter", element_list, err); + _MMCAMCORDER_ELEMENT_MAKE(sc, sc->encode_element, _MMCAMCORDER_AUDIOSRC_CAPS, "capsfilter", "audiosrc_capsfilter", element_list, err); _MMCAMCORDER_ELEMENT_MAKE(sc, sc->encode_element, _MMCAMCORDER_AUDIOSRC_QUE, "queue", "audiosrc_queue", element_list, err); MMCAMCORDER_G_OBJECT_SET(sc->encode_element[_MMCAMCORDER_AUDIOSRC_QUE].gst, "max-size-buffers", 0); @@ -1038,7 +1038,7 @@ int _mmcamcorder_create_audiosrc_bin(MMHandleType handle) } if (caps) { - MMCAMCORDER_G_OBJECT_SET_POINTER((sc->encode_element[_MMCAMCORDER_AUDIOSRC_FILT].gst), "caps", caps); + MMCAMCORDER_G_OBJECT_SET_POINTER((sc->encode_element[_MMCAMCORDER_AUDIOSRC_CAPS].gst), "caps", caps); gst_caps_unref(caps); caps = NULL; } else { @@ -1081,7 +1081,7 @@ int _mmcamcorder_create_audiosrc_bin(MMHandleType handle) pipeline_creation_error: _MMCAMCORDER_ELEMENT_REMOVE(sc->encode_element, _MMCAMCORDER_AUDIOSRC_SRC); - _MMCAMCORDER_ELEMENT_REMOVE(sc->encode_element, _MMCAMCORDER_AUDIOSRC_FILT); + _MMCAMCORDER_ELEMENT_REMOVE(sc->encode_element, _MMCAMCORDER_AUDIOSRC_CAPS); _MMCAMCORDER_ELEMENT_REMOVE(sc->encode_element, _MMCAMCORDER_AUDIOSRC_QUE); _MMCAMCORDER_ELEMENT_REMOVE(sc->encode_element, _MMCAMCORDER_AUDIOSRC_VOL); _MMCAMCORDER_ELEMENT_REMOVE(sc->encode_element, _MMCAMCORDER_AUDIOSRC_BIN); @@ -1207,7 +1207,7 @@ int _mmcamcorder_create_encodesink_bin(MMHandleType handle, MMCamcorderEncodebin /* 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_FILT, "capsfilter", "encodesink_filter", element_list, err); + _MMCAMCORDER_ELEMENT_MAKE(sc, sc->encode_element, _MMCAMCORDER_ENCSINK_CAPS, "capsfilter", "encodesink_filter", element_list, err); /* set appsrc as live source */ MMCAMCORDER_G_OBJECT_SET(sc->encode_element[_MMCAMCORDER_ENCSINK_SRC].gst, "is-live", TRUE); @@ -1218,7 +1218,7 @@ int _mmcamcorder_create_encodesink_bin(MMHandleType handle, MMCamcorderEncodebin 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_filter"); - pad = gst_element_get_static_pad(sc->element[_MMCAMCORDER_VIDEOSRC_FILT].gst, "src"); + pad = gst_element_get_static_pad(sc->element[_MMCAMCORDER_VIDEOSRC_CAPS].gst, "src"); } else { MMCAM_LOG_INFO("get pad from videosrc_que"); pad = gst_element_get_static_pad(sc->element[_MMCAMCORDER_VIDEOSRC_QUE].gst, "src"); @@ -1240,7 +1240,7 @@ int _mmcamcorder_create_encodesink_bin(MMHandleType handle, MMCamcorderEncodebin video_caps = gst_caps_fixate(video_caps); } else { /* Image */ - MMCAMCORDER_G_OBJECT_GET(sc->element[_MMCAMCORDER_VIDEOSRC_FILT].gst, "caps", &video_caps); + MMCAMCORDER_G_OBJECT_GET(sc->element[_MMCAMCORDER_VIDEOSRC_CAPS].gst, "caps", &video_caps); } if (!video_caps) { @@ -1271,7 +1271,7 @@ int _mmcamcorder_create_encodesink_bin(MMHandleType handle, MMCamcorderEncodebin g_free(caps_str); caps_str = NULL; - MMCAMCORDER_G_OBJECT_SET_POINTER(sc->encode_element[_MMCAMCORDER_ENCSINK_FILT].gst, "caps", video_caps); + MMCAMCORDER_G_OBJECT_SET_POINTER(sc->encode_element[_MMCAMCORDER_ENCSINK_CAPS].gst, "caps", video_caps); gst_caps_unref(video_caps); video_caps = NULL; @@ -1309,9 +1309,9 @@ int _mmcamcorder_create_encodesink_bin(MMHandleType handle, MMCamcorderEncodebin 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_FILT, "capsfilter", "encodesink_vscale_filter", element_list, err); + _MMCAMCORDER_ELEMENT_MAKE(sc, sc->encode_element, _MMCAMCORDER_ENCSINK_VSCALE_CAPS, "capsfilter", "encodesink_vscale_filter", element_list, err); - MMCAMCORDER_G_OBJECT_SET_POINTER((sc->encode_element[_MMCAMCORDER_ENCSINK_VSCALE_FILT].gst), "caps", videoscale_caps); + MMCAMCORDER_G_OBJECT_SET_POINTER((sc->encode_element[_MMCAMCORDER_ENCSINK_VSCALE_CAPS].gst), "caps", videoscale_caps); gst_caps_unref(videoscale_caps); videoscale_caps = NULL; @@ -1665,9 +1665,9 @@ pipeline_creation_error: _MMCAMCORDER_ELEMENT_REMOVE(sc->encode_element, _MMCAMCORDER_ENCSINK_ENCBIN); _MMCAMCORDER_ELEMENT_REMOVE(sc->encode_element, _MMCAMCORDER_ENCSINK_SRC); - _MMCAMCORDER_ELEMENT_REMOVE(sc->encode_element, _MMCAMCORDER_ENCSINK_FILT); + _MMCAMCORDER_ELEMENT_REMOVE(sc->encode_element, _MMCAMCORDER_ENCSINK_CAPS); _MMCAMCORDER_ELEMENT_REMOVE(sc->encode_element, _MMCAMCORDER_ENCSINK_VSCALE); - _MMCAMCORDER_ELEMENT_REMOVE(sc->encode_element, _MMCAMCORDER_ENCSINK_VSCALE_FILT); + _MMCAMCORDER_ELEMENT_REMOVE(sc->encode_element, _MMCAMCORDER_ENCSINK_VSCALE_CAPS); _MMCAMCORDER_ELEMENT_REMOVE(sc->encode_element, _MMCAMCORDER_ENCSINK_VENC); _MMCAMCORDER_ELEMENT_REMOVE(sc->encode_element, _MMCAMCORDER_ENCSINK_AENC); _MMCAMCORDER_ELEMENT_REMOVE(sc->encode_element, _MMCAMCORDER_ENCSINK_IENC); @@ -2655,7 +2655,7 @@ bool _mmcamcorder_set_videosrc_caps(MMHandleType handle, unsigned int fourcc, in return FALSE; } - if (!sc->element[_MMCAMCORDER_VIDEOSRC_FILT].gst) { + if (!sc->element[_MMCAMCORDER_VIDEOSRC_CAPS].gst) { MMCAM_LOG_ERROR("Video filter is NULL!"); return FALSE; } @@ -2722,7 +2722,7 @@ bool _mmcamcorder_set_videosrc_caps(MMHandleType handle, unsigned int fourcc, in MMCAM_LOG_WARNING("ITLV format doe snot support INPUT ROTATE. Ignore ROTATE[%d]", rotate); } - MMCAMCORDER_G_OBJECT_GET(sc->element[_MMCAMCORDER_VIDEOSRC_FILT].gst, "caps", &caps); + MMCAMCORDER_G_OBJECT_GET(sc->element[_MMCAMCORDER_VIDEOSRC_CAPS].gst, "caps", &caps); if (caps && !gst_caps_is_any(caps)) { GstStructure *structure = NULL; @@ -2811,7 +2811,7 @@ bool _mmcamcorder_set_videosrc_caps(MMHandleType handle, unsigned int fourcc, in return FALSE; } - MMCAMCORDER_G_OBJECT_SET_POINTER(sc->element[_MMCAMCORDER_VIDEOSRC_FILT].gst, "caps", caps); + MMCAMCORDER_G_OBJECT_SET_POINTER(sc->element[_MMCAMCORDER_VIDEOSRC_CAPS].gst, "caps", caps); gst_caps_unref(caps); return TRUE; diff --git a/src/mm_camcorder_stillshot.c b/src/mm_camcorder_stillshot.c index e1ab043..761abb7 100644 --- a/src/mm_camcorder_stillshot.c +++ b/src/mm_camcorder_stillshot.c @@ -124,16 +124,16 @@ static int __mmcamcorder_capture_mode_init_encodebin(MMHandleType handle) /* add element and encodesink bin to encode main pipeline */ gst_bin_add_many(GST_BIN(sc->encode_element[_MMCAMCORDER_ENCODE_MAIN_PIPE].gst), sc->encode_element[_MMCAMCORDER_ENCSINK_SRC].gst, - sc->encode_element[_MMCAMCORDER_ENCSINK_FILT].gst, + sc->encode_element[_MMCAMCORDER_ENCSINK_CAPS].gst, sc->encode_element[_MMCAMCORDER_ENCSINK_BIN].gst, NULL); /* Link each element : appsrc - capsfilter - encodesink bin */ srcpad = gst_element_get_static_pad(sc->encode_element[_MMCAMCORDER_ENCSINK_SRC].gst, "src"); - sinkpad = gst_element_get_static_pad(sc->encode_element[_MMCAMCORDER_ENCSINK_FILT].gst, "sink"); + sinkpad = gst_element_get_static_pad(sc->encode_element[_MMCAMCORDER_ENCSINK_CAPS].gst, "sink"); _MM_GST_PAD_LINK_UNREF(srcpad, sinkpad, err, pipeline_creation_error); - srcpad = gst_element_get_static_pad(sc->encode_element[_MMCAMCORDER_ENCSINK_FILT].gst, "src"); + srcpad = gst_element_get_static_pad(sc->encode_element[_MMCAMCORDER_ENCSINK_CAPS].gst, "src"); sinkpad = gst_element_get_static_pad(sc->encode_element[_MMCAMCORDER_ENCSINK_BIN].gst, "image_sink0"); _MM_GST_PAD_LINK_UNREF(srcpad, sinkpad, err, pipeline_creation_error); @@ -205,7 +205,7 @@ static int __mmcamcorder_capture_mode_init_image_pad(MMHandleType handle) return err; } - _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSRC_CAP_FILT, "capsfilter", "videosrc_cap_filt", element_list, err); + _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSRC_CAP_CAPS, "capsfilter", "videosrc_cap_filt", element_list, err); _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSRC_CAP_SINK, "fakesink", "videosrc_cap_sink", element_list, err); MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSRC_CAP_SINK].gst, "sync", TRUE); @@ -230,7 +230,7 @@ static int __mmcamcorder_capture_mode_init_image_pad(MMHandleType handle) caps_string = NULL; } - MMCAMCORDER_G_OBJECT_SET_POINTER(sc->element[_MMCAMCORDER_VIDEOSRC_CAP_FILT].gst, "caps", caps); + MMCAMCORDER_G_OBJECT_SET_POINTER(sc->element[_MMCAMCORDER_VIDEOSRC_CAP_CAPS].gst, "caps", caps); gst_caps_unref(caps); /* add elements to main pipeline */ @@ -242,7 +242,7 @@ static int __mmcamcorder_capture_mode_init_image_pad(MMHandleType handle) /* link elements */ if (!gst_element_link_pads(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst, "image_%u", - sc->element[_MMCAMCORDER_VIDEOSRC_CAP_FILT].gst, "sink")) { + sc->element[_MMCAMCORDER_VIDEOSRC_CAP_CAPS].gst, "sink")) { MMCAM_LOG_ERROR("capture pad link failed"); err = MM_ERROR_CAMCORDER_GST_LINK; goto pipeline_creation_error; @@ -265,7 +265,7 @@ static int __mmcamcorder_capture_mode_init_image_pad(MMHandleType handle) return MM_ERROR_NONE; pipeline_creation_error: - _MMCAMCORDER_ELEMENT_REMOVE(sc->element, _MMCAMCORDER_VIDEOSRC_CAP_FILT); + _MMCAMCORDER_ELEMENT_REMOVE(sc->element, _MMCAMCORDER_VIDEOSRC_CAP_CAPS); _MMCAMCORDER_ELEMENT_REMOVE(sc->element, _MMCAMCORDER_VIDEOSRC_CAP_SINK); if (element_list) { @@ -397,7 +397,7 @@ static int __mmcamcorder_extra_preview_mode_init_pipeline(MMHandleType handle, M _mmcamcorder_conf_set_value_element_property(sc->element[_MMCAMCORDER_VIDEOSRC_EXT_SRC].gst, videosrc_element); } - _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSRC_EXT_FILT, "capsfilter", "videosrc_ext_filt", element_list, err); + _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSRC_EXT_CAPS, "capsfilter", "videosrc_ext_filt", element_list, err); _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSRC_EXT_SINK, "fakesink", "videosrc_ext_sink", element_list, err); MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSRC_EXT_SINK].gst, "sync", TRUE); @@ -414,7 +414,7 @@ static int __mmcamcorder_extra_preview_mode_init_pipeline(MMHandleType handle, M goto pipeline_creation_error; } - MMCAMCORDER_G_OBJECT_SET_POINTER(sc->element[_MMCAMCORDER_VIDEOSRC_EXT_FILT].gst, "caps", caps); + MMCAMCORDER_G_OBJECT_SET_POINTER(sc->element[_MMCAMCORDER_VIDEOSRC_EXT_CAPS].gst, "caps", caps); gst_caps_unref(caps); /* add elements to main pipeline */ @@ -427,7 +427,7 @@ static int __mmcamcorder_extra_preview_mode_init_pipeline(MMHandleType handle, M /* link elements */ if (mode == MM_CAMCORDER_EXTRA_PREVIEW_MODE_PIPELINE_SRCPAD) { if (!gst_element_link_pads(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst, "video_%u", - sc->element[_MMCAMCORDER_VIDEOSRC_EXT_FILT].gst, "sink")) { + sc->element[_MMCAMCORDER_VIDEOSRC_EXT_CAPS].gst, "sink")) { MMCAM_LOG_ERROR("pad for extra preview link failed"); err = MM_ERROR_CAMCORDER_GST_LINK; goto pipeline_creation_error; @@ -451,7 +451,7 @@ static int __mmcamcorder_extra_preview_mode_init_pipeline(MMHandleType handle, M return MM_ERROR_NONE; pipeline_creation_error: - _MMCAMCORDER_ELEMENT_REMOVE(sc->element, _MMCAMCORDER_VIDEOSRC_EXT_FILT); + _MMCAMCORDER_ELEMENT_REMOVE(sc->element, _MMCAMCORDER_VIDEOSRC_EXT_CAPS); _MMCAMCORDER_ELEMENT_REMOVE(sc->element, _MMCAMCORDER_VIDEOSRC_EXT_SINK); if (element_list) { diff --git a/src/mm_camcorder_videorec.c b/src/mm_camcorder_videorec.c index f2dcb6e..42ff6ce 100644 --- a/src/mm_camcorder_videorec.c +++ b/src/mm_camcorder_videorec.c @@ -260,34 +260,34 @@ int _mmcamcorder_create_recorder_pipeline(MMHandleType handle) if (sc->info_video->use_videoscale) { gst_bin_add_many(GST_BIN(sc->encode_element[_MMCAMCORDER_ENCODE_MAIN_PIPE].gst), sc->encode_element[_MMCAMCORDER_ENCSINK_SRC].gst, - sc->encode_element[_MMCAMCORDER_ENCSINK_FILT].gst, + sc->encode_element[_MMCAMCORDER_ENCSINK_CAPS].gst, sc->encode_element[_MMCAMCORDER_ENCSINK_VSCALE].gst, - sc->encode_element[_MMCAMCORDER_ENCSINK_VSCALE_FILT].gst, + sc->encode_element[_MMCAMCORDER_ENCSINK_VSCALE_CAPS].gst, sc->encode_element[_MMCAMCORDER_ENCSINK_BIN].gst, NULL); } else { gst_bin_add_many(GST_BIN(sc->encode_element[_MMCAMCORDER_ENCODE_MAIN_PIPE].gst), sc->encode_element[_MMCAMCORDER_ENCSINK_SRC].gst, - sc->encode_element[_MMCAMCORDER_ENCSINK_FILT].gst, + sc->encode_element[_MMCAMCORDER_ENCSINK_CAPS].gst, sc->encode_element[_MMCAMCORDER_ENCSINK_BIN].gst, NULL); } /* Link each element : appsrc - capsfilter - encodesink bin */ srcpad = gst_element_get_static_pad(sc->encode_element[_MMCAMCORDER_ENCSINK_SRC].gst, "src"); - sinkpad = gst_element_get_static_pad(sc->encode_element[_MMCAMCORDER_ENCSINK_FILT].gst, "sink"); + sinkpad = gst_element_get_static_pad(sc->encode_element[_MMCAMCORDER_ENCSINK_CAPS].gst, "sink"); _MM_GST_PAD_LINK_UNREF(srcpad, sinkpad, err, pipeline_creation_error); - srcpad = gst_element_get_static_pad(sc->encode_element[_MMCAMCORDER_ENCSINK_FILT].gst, "src"); + srcpad = gst_element_get_static_pad(sc->encode_element[_MMCAMCORDER_ENCSINK_CAPS].gst, "src"); if (sc->info_video->use_videoscale) { sinkpad = gst_element_get_static_pad(sc->encode_element[_MMCAMCORDER_ENCSINK_VSCALE].gst, "sink"); _MM_GST_PAD_LINK_UNREF(srcpad, sinkpad, err, pipeline_creation_error); srcpad = gst_element_get_static_pad(sc->encode_element[_MMCAMCORDER_ENCSINK_VSCALE].gst, "src"); - sinkpad = gst_element_get_static_pad(sc->encode_element[_MMCAMCORDER_ENCSINK_VSCALE_FILT].gst, "sink"); + sinkpad = gst_element_get_static_pad(sc->encode_element[_MMCAMCORDER_ENCSINK_VSCALE_CAPS].gst, "sink"); _MM_GST_PAD_LINK_UNREF(srcpad, sinkpad, err, pipeline_creation_error); - srcpad = gst_element_get_static_pad(sc->encode_element[_MMCAMCORDER_ENCSINK_VSCALE_FILT].gst, "src"); + srcpad = gst_element_get_static_pad(sc->encode_element[_MMCAMCORDER_ENCSINK_VSCALE_CAPS].gst, "src"); } sinkpad = gst_element_get_static_pad(sc->encode_element[_MMCAMCORDER_ENCSINK_BIN].gst, "video_sink0"); _MM_GST_PAD_LINK_UNREF(srcpad, sinkpad, err, pipeline_creation_error); -- 2.34.1