From 171cba14245ce58479b01def728884d68403df08 Mon Sep 17 00:00:00 2001 From: Breit Date: Fri, 9 Mar 2018 13:15:38 -0500 Subject: [PATCH] fixed merge conflicts. --- source/CInstantCameraAppSrc.cpp | 4 ---- source/CPipelineHelper.cpp | 11 ----------- 2 files changed, 15 deletions(-) diff --git a/source/CInstantCameraAppSrc.cpp b/source/CInstantCameraAppSrc.cpp index ef0d242..970c46f 100644 --- a/source/CInstantCameraAppSrc.cpp +++ b/source/CInstantCameraAppSrc.cpp @@ -421,11 +421,7 @@ bool CInstantCameraAppSrc::retrieve_image() m_Image.GetImageSize(), NULL, NULL); -<<<<<<< HEAD -======= - ->>>>>>> 6898823b90b0451beb75dd6fea694e4a1c042efa // Push the gst buffer wrapping the image buffer to the source pads of the AppSrc element, where it's picked up by the rest of the pipeline GstFlowReturn ret; g_signal_emit_by_name(m_appsrc, "push-buffer", m_gstBuffer, &ret); diff --git a/source/CPipelineHelper.cpp b/source/CPipelineHelper.cpp index 986615f..af6a24e 100644 --- a/source/CPipelineHelper.cpp +++ b/source/CPipelineHelper.cpp @@ -124,17 +124,6 @@ bool CPipelineHelper::build_pipeline_display() g_object_set(G_OBJECT(filter), "caps", filter_caps, NULL); gst_caps_unref(filter_caps); - // if you are using nvidia tx1/tx2, the built-in video sink that is found by autovideosink does not advertise it needs conversion (it does not support RGB). - // so we must use a filter such that the converter knows to convert the image format. - // if you are using a video sink that supports RGB, then you do not need to convert to i420 and you can remove this filter and save some cpu load. - GstElement *filter; - GstCaps *filter_caps; - filter = gst_element_factory_make("capsfilter", "filter"); - filter_caps = gst_caps_new_simple("video/x-raw","format", G_TYPE_STRING, "I420", NULL); - - g_object_set(G_OBJECT(filter), "caps", filter_caps, NULL); - gst_caps_unref(filter_caps); - // add and link the pipeline elements gst_bin_add_many(GST_BIN(m_pipeline), m_source, m_videoScaler, m_videoScalerCaps, convert, filter, sink, NULL); gst_element_link_many(m_source, m_videoScaler, m_videoScalerCaps, convert, filter, sink, NULL);