Change element name for recording

[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
old mode 100644 (file)
new mode 100755 (executable)
index 39c5285..efacf54
--- a/src/mm_camcorder_gstcommon.c
+++ b/src/mm_camcorder_gstcommon.c
@@ -362,10 +362,12 @@ gboolean _mmcamcorder_invoke_video_stream_cb(MMHandleType handle, GstBuffer *buf
        }
 
        /* set size and timestamp */
-       if (_mmcamcorder_is_encoded_preview_pixel_format(stream.format))
+       if (_mmcamcorder_is_encoded_preview_pixel_format(stream.format)) {
                memory = gst_buffer_get_all_memory(buffer);
-       else
+               stream.internal_buffer = buffer;
+       } else {
                memory = gst_buffer_peek_memory(buffer, 0);
+       }
        if (!memory) {
                MMCAM_LOG_ERROR("GstMemory get failed from buffer %p", buffer);
                return FALSE;
@@ -1274,7 +1276,8 @@ int _mmcamcorder_create_encodesink_bin(MMHandleType handle, MMCamcorderEncodebin
                        hcamcorder);
        }
 
-       _MMCAMCORDER_ELEMENT_MAKE(sc, sc->encode_element, _MMCAMCORDER_ENCSINK_ENCBIN, "encodebin", "encodesink_encbin", element_list, err);
+       _MMCAMCORDER_ELEMENT_MAKE(sc, sc->encode_element, _MMCAMCORDER_ENCSINK_ENCBIN,
+               "tizenencodebin", "encodesink_encbin", element_list, err);
 
        /* check element availability */
        if (profile == MM_CAMCORDER_ENCBIN_PROFILE_IMAGE) {
@@ -1690,9 +1693,6 @@ int _mmcamcorder_create_preview_pipeline(MMHandleType handle)
 
        bus = gst_pipeline_get_bus(GST_PIPELINE(sc->element[_MMCAMCORDER_MAIN_PIPE].gst));
 
-       /* Register pipeline message callback */
-       hcamcorder->pipeline_cb_event_id = gst_bus_add_watch(bus, _mmcamcorder_pipeline_cb_message, (gpointer)hcamcorder);
-
        /* set sync handler */
        gst_bus_set_sync_handler(bus, _mmcamcorder_pipeline_bus_sync_callback, (gpointer)hcamcorder, NULL);
 
@@ -1743,9 +1743,6 @@ int _mmcamcorder_videosink_window_set(MMHandleType handle, type_element* Videosi
        int zoom_attr = 0;
        int zoom_level = 0;
        int do_scaling = FALSE;
-#ifdef _MMCAMCORDER_RM_SUPPORT
-       int display_scaler = 0;
-#endif /* _MMCAMCORDER_RM_SUPPORT */
        int *dp_handle = NULL;
        MMCamWindowInfo *window_info = NULL;
        gulong xid;
@@ -1814,10 +1811,8 @@ int _mmcamcorder_videosink_window_set(MMHandleType handle, type_element* Videosi
                        gst_video_overlay_set_window_handle(GST_VIDEO_OVERLAY(vsink), 0);
                }
 #ifdef _MMCAMCORDER_RM_SUPPORT
-               if (hcamcorder->request_resources.category_id[0] == RM_CATEGORY_VIDEO_DECODER_SUB)
-                       display_scaler = 1;
-
-               MMCAMCORDER_G_OBJECT_SET(vsink, "device-scaler", display_scaler);
+               /* set the videosink using the virtual device id instead of the real id (main=0, sub=1) */
+               MMCAMCORDER_G_OBJECT_SET(vsink, "device-scaler", hcamcorder->returned_devices.device_id[1]);
 #endif /* _MMCAMCORDER_RM_SUPPORT */
        } else if (!strcmp(videosink_name, "evasimagesink") || !strcmp(videosink_name, "evaspixmapsink")) {
                MMCAM_LOG_INFO("videosink : %s, handle : %p", videosink_name, dp_handle);
@@ -1856,9 +1851,9 @@ int _mmcamcorder_videosink_window_set(MMHandleType handle, type_element* Videosi
                        MMCAM_LOG_WARNING("dp_handle is null");
                }
 #ifdef _MMCAMCORDER_RM_SUPPORT
-               if (hcamcorder->request_resources.category_id[0] == RM_CATEGORY_VIDEO_DECODER_SUB)
-                       display_scaler = 1;
-               MMCAMCORDER_G_OBJECT_SET(vsink, "device-scaler", display_scaler);
+               /* set the videosink using the virtual device id instead of the real id (main=0, sub=1) */
+               MMCAM_LOG_INFO("device-scaler : %d", hcamcorder->returned_devices.device_id[1]);
+               MMCAMCORDER_G_OBJECT_SET(vsink, "device-scaler", hcamcorder->returned_devices.device_id[1]);
 #endif /* _MMCAMCORDER_RM_SUPPORT */
        } else {
                MMCAM_LOG_WARNING("Who are you?? (Videosink: %s)", videosink_name);