Merge pull request IntelRealSense#2128 from matkatz1/tag_profiles_red…

…esign

change tag_profile to tag_profiles and move the tagging to sensor_base

src/core/streaming.h

@@ -169,7 +169,7 @@ namespace librealsense
 
         virtual std::vector<tagged_profile> get_profiles_tags() const = 0;
 
-        virtual void tag_profile(stream_profile_interface* profile) const = 0;
+        virtual void tag_profiles(stream_profiles profiles) const = 0;
     };
 
     class depth_stereo_sensor;

src/device.cpp

@@ -263,20 +263,23 @@ void librealsense::device::register_stream_to_extrinsic_group(const stream_inter
     }
 }
 
-void librealsense::device::tag_profile(stream_profile_interface* profile) const
+void librealsense::device::tag_profiles(stream_profiles profiles) const
 {
-    for (auto tag : *_profiles_tags)
+    for (auto profile : profiles)
     {
-        auto vp = dynamic_cast<video_stream_profile_interface*>(profile);
-        if (vp)
+        for (auto tag : *_profiles_tags)
         {
-            if ((tag.stream == RS2_STREAM_ANY || vp->get_stream_type() == tag.stream) &&
-                (tag.format == RS2_FORMAT_ANY || vp->get_format() == tag.format) &&
-                (tag.width == -1 || vp->get_width() == tag.width) &&
-                (tag.height == -1 || vp->get_height() == tag.height) &&
-                (tag.fps == -1 || vp->get_framerate() == tag.fps) &&
-                (tag.stream_index == -1 || vp->get_stream_index() == tag.stream_index))
-                profile->tag_profile(tag.tag);
+            auto vp = dynamic_cast<video_stream_profile_interface*>(profile.get());
+            if (vp)
+            {
+                if ((tag.stream == RS2_STREAM_ANY || vp->get_stream_type() == tag.stream) &&
+                    (tag.format == RS2_FORMAT_ANY || vp->get_format() == tag.format) &&
+                    (tag.width == -1 || vp->get_width() == tag.width) &&
+                    (tag.height == -1 || vp->get_height() == tag.height) &&
+                    (tag.fps == -1 || vp->get_framerate() == tag.fps) &&
+                    (tag.stream_index == -1 || vp->get_stream_index() == tag.stream_index))
+                    profile->tag_profile(tag.tag);
+            }
         }
     }
 }

src/device.h

@@ -72,7 +72,7 @@ namespace librealsense
             return _is_valid;
         }
 
-        void tag_profile(stream_profile_interface* profile) const override;
+        void tag_profiles(stream_profiles profiles) const override;
 
     protected:
         int add_sensor(std::shared_ptr<sensor_interface> sensor_base);

src/ds5/ds5-color.cpp

@@ -170,8 +170,6 @@ namespace librealsense
                 else
                     return rs2_intrinsics{};
             });
-
-            get_device().tag_profile(video);
         }
 
         return results;

src/ds5/ds5-device.cpp

@@ -142,8 +142,6 @@ namespace librealsense
                 }
                 auto vid_profile = dynamic_cast<video_stream_profile_interface*>(p.get());
 
-                get_device().tag_profile(vid_profile);
-
                 // Register intrinsics
                 if (p->get_format() != RS2_FORMAT_Y16) // Y16 format indicate unrectified images, no intrinsics are available for these
                 {
@@ -233,8 +231,6 @@ namespace librealsense
                 }
                 auto video = dynamic_cast<video_stream_profile_interface*>(p.get());
 
-                get_device().tag_profile(video);
-
                 // Register intrinsics
                 if (p->get_format() != RS2_FORMAT_Y16) // Y16 format indicate unrectified images, no intrinsics are available for these
                 {

src/ds5/ds5-motion.cpp

@@ -77,9 +77,6 @@ namespace librealsense
                     assign_stream(_owner->_gyro_stream, p);
                 if (p->get_stream_type() == RS2_STREAM_GPIO)
                     assign_stream(_owner->_gpio_streams[p->get_stream_index()-1], p);
-                if (p->get_framerate() == 1000 &&
-                    p->get_format() == RS2_FORMAT_MOTION_XYZ32F)
-                    get_device().tag_profile(p.get());
 
                 //set motion intrinsics
                 if (p->get_stream_type() == RS2_STREAM_ACCEL || p->get_stream_type() == RS2_STREAM_GYRO)
@@ -127,8 +124,6 @@ namespace librealsense
 
                 auto video = dynamic_cast<video_stream_profile_interface*>(p.get());
 
-                get_device().tag_profile(video);
-
                 auto profile = to_profile(p.get());
                 std::weak_ptr<ds5_fisheye_sensor> wp =
                     std::dynamic_pointer_cast<ds5_fisheye_sensor>(this->shared_from_this());

src/ivcam/sr300.h

@@ -237,8 +237,6 @@ namespace librealsense
                     // Register intrinsics
                     auto video = dynamic_cast<video_stream_profile_interface*>(p.get());
 
-                    get_device().tag_profile(video);
-
                     auto profile = to_profile(p.get());
                     std::weak_ptr<sr300_color_sensor> wp =
                         std::dynamic_pointer_cast<sr300_color_sensor>(this->shared_from_this());
@@ -293,8 +291,6 @@ namespace librealsense
                     // Register intrinsics
                     auto video = dynamic_cast<video_stream_profile_interface*>(p.get());
 
-                    get_device().tag_profile(video);
-
                     auto profile = to_profile(p.get());
                     std::weak_ptr<sr300_depth_sensor> wp =
                         std::dynamic_pointer_cast<sr300_depth_sensor>(this->shared_from_this());

src/l500/l500.h

@@ -193,8 +193,6 @@ namespace librealsense
                     // Register intrinsics
                     auto video = dynamic_cast<video_stream_profile_interface*>(p.get());
 
-                    get_device().tag_profile(video);
-
                     auto profile = to_profile(p.get());
                     std::weak_ptr<l500_depth_sensor> wp =
                         std::dynamic_pointer_cast<l500_depth_sensor>(this->shared_from_this());

src/media/playback/playback_device.cpp

@@ -39,10 +39,7 @@ playback_device::playback_device(std::shared_ptr<context> ctx, std::shared_ptr<d
     for (auto sensor_pair : m_sensors)
     {
         auto profiles = sensor_pair.second->get_stream_profiles();
-        for(auto profile : profiles)
-        {
-            tag_profile(profile.get());
-        }
+        tag_profiles(profiles);
     }
     register_extrinsics(m_device_description);
 }

src/media/playback/playback_device.h

@@ -49,9 +49,10 @@ namespace librealsense
         bool is_valid() const override;
 
         std::vector<tagged_profile> get_profiles_tags() const override { return std::vector<tagged_profile>(); };//no hard-coded default streams for playback
-        void tag_profile(stream_profile_interface* profile) const override 
+        void tag_profiles(stream_profiles profiles) const override 
         {
-            profile->tag_profile(profile_tag::PROFILE_TAG_DEFAULT | profile_tag::PROFILE_TAG_SUPERSET);
+            for(auto profile : profiles)
+                profile->tag_profile(profile_tag::PROFILE_TAG_DEFAULT | profile_tag::PROFILE_TAG_SUPERSET);
         }
 
     private:

src/media/record/record_device.h

@@ -44,7 +44,7 @@ namespace librealsense
         bool is_valid() const override;
 
         std::vector<tagged_profile> get_profiles_tags() const override { return m_device->get_profiles_tags(); };
-        void tag_profile(stream_profile_interface* profile) const override { m_device->tag_profile(profile); }
+        void tag_profiles(stream_profiles profiles) const override { m_device->tag_profiles(profiles); }
 
     private:
         template <typename T> void write_device_extension_changes(const T& ext);

src/sensor.cpp

@@ -22,7 +22,11 @@ namespace librealsense
           _metadata_parsers(std::make_shared<metadata_parser_map>()),
           _on_open(nullptr),
           _owner(dev),
-          _profiles([this]() { return this->init_stream_profiles(); })
+          _profiles([this]() {
+                auto profiles = this->init_stream_profiles();
+                _owner->tag_profiles(profiles);
+                return profiles;
+          })
     {
         register_option(RS2_OPTION_FRAMES_QUEUE_SIZE, _source.get_published_size_option());