From 60b12c3f4c59b9e3d94cc375b9873f20883f2593 Mon Sep 17 00:00:00 2001 From: arnav dhamija Date: Wed, 28 Oct 2020 23:53:11 -0400 Subject: [PATCH] updated config files --- config/MJPGCamera.cfg | 4 +--- config/RPiCamera.cfg | 2 -- config/ZEDCamera.cfg | 4 +--- src/Camera/MJPGCamera.cpp | 10 +--------- src/Camera/MJPGCamera.h | 2 -- src/Camera/ZEDCamera.cpp | 10 +--------- src/Camera/ZEDCamera.h | 2 -- 7 files changed, 4 insertions(+), 30 deletions(-) diff --git a/config/MJPGCamera.cfg b/config/MJPGCamera.cfg index a368429..5224255 100644 --- a/config/MJPGCamera.cfg +++ b/config/MJPGCamera.cfg @@ -1,9 +1,7 @@ camera: { properties: { - launch_string = "v4l2src name=src device=%device ! capsfilter name=capsfilter caps=%capsfilter ! jpegdec ! videoconvert ! textoverlay name=textoverlay ! x264enc name=%encoder bitrate=%bitrate key-int-max = 10 threads = 4 tune = 4 intra-refresh = true ! tee name=tee_element tee_element. ! queue ! h264parse ! rtph264pay name=pay0"; + launch_string = "v4l2src name=src device=%device ! capsfilter name=capsfilter caps=%capsfilter ! jpegdec ! videoconvert ! textoverlay name=textoverlay ! x264enc name=encoder bitrate=%bitrate key-int-max = 10 threads = 4 tune = 4 intra-refresh = true ! tee name=tee_element tee_element. ! queue ! h264parse ! rtph264pay name=pay0"; capsfilter = "image/jpeg,width=(int)%width,height=(int)%height,framerate=(fraction)%framerate/1"; - mode = "encoder"; - encoder_name = "x264enc"; supported_qualities = 511; dynamic_res = true; dynamic_bitrate = true; diff --git a/config/RPiCamera.cfg b/config/RPiCamera.cfg index d7a5656..47f2be8 100644 --- a/config/RPiCamera.cfg +++ b/config/RPiCamera.cfg @@ -2,8 +2,6 @@ camera: { properties: { launch_string = "v4l2src name=src device=%device ! queue ! capsfilter name=capsfilter caps=%capsfilter ! tee name=tee_element tee_element. ! queue ! h264parse ! rtph264pay name=pay0"; capsfilter = "video/x-h264,width=(int)%width,height=(int)%height,framerate=(fraction)%framerate/1"; - mode = "encoder"; - encoder_name = "omxh264enc"; supported_qualities = 511; dynamic_res = true; dynamic_bitrate = true; diff --git a/config/ZEDCamera.cfg b/config/ZEDCamera.cfg index 777c6be..ad8bd81 100644 --- a/config/ZEDCamera.cfg +++ b/config/ZEDCamera.cfg @@ -1,9 +1,7 @@ camera: { properties: { - launch_string = "v4l2src name=src device=%device ! videoconvert ! capsfilter name=capsfilter caps=%capsfilter ! x264enc name=%encoder bitrate=%bitrate ! tee name=tee_element tee_element. ! queue ! h264parse ! rtph264pay name=pay0"; + launch_string = "v4l2src name=src device=%device ! videoconvert ! capsfilter name=capsfilter caps=%capsfilter ! x264enc name=encoder bitrate=%bitrate ! tee name=tee_element tee_element. ! queue ! h264parse ! rtph264pay name=pay0"; capsfilter = "video/x-raw,format=(string)I420,width=(int)%width,height=(int)%height"; - mode = "encoder"; - encoder_name = "x264enc"; supported_qualities = 511; dynamic_res = false; dynamic_bitrate = true; diff --git a/src/Camera/MJPGCamera.cpp b/src/Camera/MJPGCamera.cpp index 8e991fb..5a421c7 100644 --- a/src/Camera/MJPGCamera.cpp +++ b/src/Camera/MJPGCamera.cpp @@ -30,7 +30,7 @@ MJPGCamera::MJPGCamera(string device, Quality q) : Camera(device, q), encoder(nu bool MJPGCamera::set_element_references(GstElement *pipeline) { - encoder = gst_bin_get_by_name(GST_BIN(pipeline), encoder_name.c_str()); + encoder = gst_bin_get_by_name(GST_BIN(pipeline), "encoder"); capsfilter = gst_bin_get_by_name(GST_BIN(pipeline), "capsfilter"); if (encoder && capsfilter) { return true; @@ -137,12 +137,6 @@ bool MJPGCamera::set_quality(Quality q) return true; } -bool MJPGCamera::read_configuration(Setting &camera_config, Setting &quality_config) -{ - encoder_name = static_cast(camera_config.lookup("camera.properties.encoder_name")); - return Camera::read_configuration(camera_config, quality_config); -} - string MJPGCamera::generate_launch_string() const { string capsfilter_string; @@ -161,12 +155,10 @@ string MJPGCamera::generate_launch_string() const capsfilter_string = generate_capsfilter(); regex d("%device"); regex cf("%capsfilter"); - regex enc("%encoder"); regex br("%bitrate"); string result; result = regex_replace(launch_string, d, device_path); result = regex_replace(result, cf, capsfilter_string); - result = regex_replace(result, enc, encoder_name); result = regex_replace(result, br, to_string(launch_bitrate)); return result; } \ No newline at end of file diff --git a/src/Camera/MJPGCamera.h b/src/Camera/MJPGCamera.h index 707bae3..6febc1e 100644 --- a/src/Camera/MJPGCamera.h +++ b/src/Camera/MJPGCamera.h @@ -9,8 +9,6 @@ class MJPGCamera : public Camera protected: GstElement *encoder; GstElement *capsfilter; - string encoder_name; - virtual bool read_configuration(Setting &camera_config, Setting &quality_config) override; bool get_supported_qualities(); public: diff --git a/src/Camera/ZEDCamera.cpp b/src/Camera/ZEDCamera.cpp index cf84f0b..60ccdbf 100644 --- a/src/Camera/ZEDCamera.cpp +++ b/src/Camera/ZEDCamera.cpp @@ -23,7 +23,7 @@ ZEDCamera::ZEDCamera(string device, Quality q) : Camera(device, q), encoder(null bool ZEDCamera::set_element_references(GstElement *pipeline) { - encoder = gst_bin_get_by_name(GST_BIN(pipeline), encoder_name.c_str()); + encoder = gst_bin_get_by_name(GST_BIN(pipeline), "encoder"); capsfilter = gst_bin_get_by_name(GST_BIN(pipeline), "capsfilter"); if (encoder && capsfilter) { return true; @@ -57,12 +57,6 @@ bool ZEDCamera::set_quality(Quality q) return true; } -bool ZEDCamera::read_configuration(Setting &camera_config, Setting &quality_config) -{ - encoder_name = static_cast(camera_config.lookup("camera.properties.encoder_name")); - return Camera::read_configuration(camera_config, quality_config); -} - string ZEDCamera::generate_launch_string() const { string capsfilter_string; @@ -81,12 +75,10 @@ string ZEDCamera::generate_launch_string() const capsfilter_string = generate_capsfilter(); regex d("%device"); regex cf("%capsfilter"); - regex enc("%encoder"); regex br("%bitrate"); string result; result = regex_replace(launch_string, d, device_path); result = regex_replace(result, cf, capsfilter_string); - result = regex_replace(result, enc, encoder_name); result = regex_replace(result, br, to_string(launch_bitrate)); return result; } diff --git a/src/Camera/ZEDCamera.h b/src/Camera/ZEDCamera.h index 62499c2..f6cd39b 100644 --- a/src/Camera/ZEDCamera.h +++ b/src/Camera/ZEDCamera.h @@ -9,8 +9,6 @@ class ZEDCamera : public Camera protected: GstElement *encoder; GstElement *capsfilter; - string encoder_name; - virtual bool read_configuration(Setting &camera_config, Setting &quality_config) override; public: ZEDCamera(string device, Quality q);