Add new field to configure to control interval of audio buffer

[platform/core/multimedia/libmm-camcorder.git] / src / mm_camcorder_gstcommon.c

diff --git a/src/mm_camcorder_gstcommon.c b/src/mm_camcorder_gstcommon.c
index 7692784..7ad12b8 100644 (file)
--- a/src/mm_camcorder_gstcommon.c
+++ b/src/mm_camcorder_gstcommon.c
@@ -480,6 +480,8 @@ int _mmcamcorder_create_audiosrc_bin(MMHandleType handle)
        char *stream_type = NULL;
        char stream_type_len = 0;
        int stream_index = 0;
+       int buffer_interval = 0;
+       int blocksize = 0;
 
        GstCaps *caps = NULL;
        GstPad *pad = NULL;
@@ -562,6 +564,17 @@ int _mmcamcorder_create_audiosrc_bin(MMHandleType handle)
        /* set audiosrc properties in ini configuration */
        _mmcamcorder_conf_set_value_element_property(sc->encode_element[_MMCAMCORDER_AUDIOSRC_SRC].gst, AudiosrcElement);
 
+       /* set block size */
+       _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_main,
+               CONFIGURE_CATEGORY_MAIN_AUDIO_INPUT,
+               "AudioBufferInterval",
+               &buffer_interval);
+
+       if (_mmcamcorder_get_audiosrc_blocksize(rate, format, channel, buffer_interval, &blocksize)) {
+               _mmcam_dbg_log("set audiosrc block size %d", blocksize);
+               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_QUE, "queue", "audiosrc_queue", element_list, err);
@@ -1285,10 +1298,10 @@ int _mmcamcorder_videosink_window_set(MMHandleType handle, type_element* Videosi
 {
        int err = MM_ERROR_NONE;
        int size = 0;
-       int retx = 0;
-       int rety = 0;
-       int retwidth = 0;
-       int retheight = 0;
+       int rect_x = 0;
+       int rect_y = 0;
+       int rect_width = 0;
+       int rect_height = 0;
        int visible = 0;
        int rotation = MM_DISPLAY_ROTATION_NONE;
        int flip = MM_FLIP_NONE;
@@ -1324,10 +1337,10 @@ int _mmcamcorder_videosink_window_set(MMHandleType handle, type_element* Videosi
 
        /* Get video display information */
        err = mm_camcorder_get_attributes(handle, &err_name,
-               MMCAM_DISPLAY_RECT_X, &retx,
-               MMCAM_DISPLAY_RECT_Y, &rety,
-               MMCAM_DISPLAY_RECT_WIDTH, &retwidth,
-               MMCAM_DISPLAY_RECT_HEIGHT, &retheight,
+               MMCAM_DISPLAY_RECT_X, &rect_x,
+               MMCAM_DISPLAY_RECT_Y, &rect_y,
+               MMCAM_DISPLAY_RECT_WIDTH, &rect_width,
+               MMCAM_DISPLAY_RECT_HEIGHT, &rect_height,
                MMCAM_DISPLAY_ROTATION, &rotation,
                MMCAM_DISPLAY_FLIP, &flip,
                MMCAM_DISPLAY_VISIBLE, &visible,
@@ -1428,12 +1441,17 @@ int _mmcamcorder_videosink_window_set(MMHandleType handle, type_element* Videosi
                MMCAMCORDER_G_OBJECT_SET(vsink, "zoom", zoom_level);
 
                if (display_geometry_method == MM_DISPLAY_METHOD_CUSTOM_ROI) {
-                       g_object_set(vsink,
-                               "dst-roi-x", retx,
-                               "dst-roi-y", rety,
-                               "dst-roi-w", retwidth,
-                               "dst-roi-h", retheight,
-                               NULL);
+                       if (!strcmp(videosink_name, "waylandsink")) {
+                           gst_video_overlay_set_render_rectangle(GST_VIDEO_OVERLAY(vsink),
+                                       rect_x, rect_y, rect_width, rect_height);
+                       } else {
+                               g_object_set(vsink,
+                                       "dst-roi-x", rect_x,
+                                       "dst-roi-y", rect_y,
+                                       "dst-roi-w", rect_width,
+                                       "dst-roi-h", rect_height,
+                                       NULL);
+                       }
                }
        }
 
@@ -1827,7 +1845,7 @@ static GstPadProbeReturn __mmcamcorder_video_dataprobe_push_buffer_to_record(Gst
        /* push buffer in appsrc to encode */
        if (!sc->info_video) {
                _mmcam_dbg_warn("sc->info_video is NULL!!");
-               return FALSE;
+               return GST_PAD_PROBE_DROP;
        }
 
        if (sc->info_video->push_encoding_buffer == PUSH_ENCODING_BUFFER_RUN &&
@@ -2131,11 +2149,11 @@ bool _mmcamcorder_set_display_rotation(MMHandleType handle, int display_rotate,
                        !strcmp(videosink_name, "directvideosink")) {
                        MMCAMCORDER_G_OBJECT_SET(sc->element[videosink_index].gst, "rotate", display_rotate);
                        _mmcam_dbg_log("Set display-rotate [%d] done.", display_rotate);
-                       return TRUE;
                } else {
-                       _mmcam_dbg_warn("videosink[%s] does not support DISPLAY_ROTATION.", videosink_name);
-                       return FALSE;
+                       _mmcam_dbg_warn("[%s] does not support DISPLAY_ROTATION, but no error", videosink_name);
                }
+
+               return TRUE;
        } else {
                _mmcam_dbg_err("Videosink element is null");
                return FALSE;
@@ -2170,11 +2188,11 @@ bool _mmcamcorder_set_display_flip(MMHandleType handle, int display_flip, int vi
                        !strcmp(videosink_name, "directvideosink")) {
                        MMCAMCORDER_G_OBJECT_SET(sc->element[videosink_index].gst, "flip", display_flip);
                        _mmcam_dbg_log("Set display flip [%d] done.", display_flip);
-                       return TRUE;
                } else {
-                       _mmcam_dbg_warn("videosink[%s] does not support DISPLAY_FLIP", videosink_name);
-                       return FALSE;
+                       _mmcam_dbg_warn("[%s] does not support DISPLAY_FLIP, but no error", videosink_name);
                }
+
+               return TRUE;
        } else {
                _mmcam_dbg_err("Videosink element is null");
                return FALSE;