Drop the unnecessary indirection of mc::BufferStreamFactory (#3368)

We only create a `mc::Stream` in like 1 place, the implementation of
`BufferStreamFactory` is trivial, and I'm about to remove *all* the
parameters from the `mc::Stream` constructor anyway.

There's no need to keep this indirection (and the tests that check that
we correctly call through that indirection)

src/server/compositor/stream.h → src/include/server/mir/compositor/stream.h

@@ -20,7 +20,6 @@
 #include "mir/compositor/buffer_stream.h"
 #include "mir/geometry/size.h"
 #include "mir/synchronised.h"
-#include "multi_monitor_arbiter.h"
 
 #include <atomic>
 #include <mutex>
@@ -31,6 +30,8 @@ namespace mir
 {
 namespace compositor
 {
+class MultiMonitorArbiter;
+
 class Stream : public BufferStream
 {
 public:

src/include/server/mir/default_server_configuration.h

@@ -43,7 +43,6 @@ class MultiplexingDispatchable;
 }
 namespace compositor
 {
-class BufferStreamFactory;
 class Scene;
 class DisplayBufferCompositorFactory;
 class Compositor;
@@ -81,7 +80,6 @@ namespace scene
 {
 class SurfaceFactory;
 class BroadcastingSessionEventSink;
-class BufferStreamFactory;
 class MediatingDisplayChanger;
 class SessionContainer;
 class SessionEventSink;
@@ -291,7 +289,6 @@ class DefaultServerConfiguration : public virtual ServerConfiguration
     /** @name scene configuration - dependencies
      * dependencies of scene on the rest of the Mir
      *  @{ */
-    virtual std::shared_ptr<scene::BufferStreamFactory> the_buffer_stream_factory();
     virtual std::shared_ptr<scene::SceneReport>      the_scene_report();
     /** @} */
 
@@ -385,7 +382,6 @@ class DefaultServerConfiguration : public virtual ServerConfiguration
 
     CachedPtr<frontend::SessionAuthorizer> session_authorizer;
     CachedPtr<renderer::RendererFactory> renderer_factory;
-    CachedPtr<compositor::BufferStreamFactory> buffer_stream_factory;
     CachedPtr<scene::SurfaceStack> scene_surface_stack;
     CachedPtr<shell::SurfaceStack> surface_stack;
     CachedPtr<scene::SceneReport> scene_report;

src/include/server/mir/server.h

@@ -54,7 +54,6 @@ class SurfaceStack;
 namespace scene
 {
 class ApplicationNotRespondingDetector;
-class BufferStreamFactory;
 class PromptSessionListener;
 class PromptSessionManager;
 class SessionListener;
@@ -395,9 +394,6 @@ class Server
     /// \return the display layout.
     auto the_shell_display_layout() const -> std::shared_ptr<shell::DisplayLayout>;
 
-    /// \return the buffer stream factory
-    auto the_buffer_stream_factory() const -> std::shared_ptr<scene::BufferStreamFactory>;
-
     /// \return the surface factory
     auto the_surface_factory() const -> std::shared_ptr<scene::SurfaceFactory>;
 

src/server/compositor/CMakeLists.txt

@@ -9,11 +9,11 @@ set(
 
   default_display_buffer_compositor.cpp
   default_display_buffer_compositor_factory.cpp
-  buffer_stream_factory.cpp
   multi_threaded_compositor.cpp
   occlusion.cpp
   default_configuration.cpp
   stream.cpp
+  ${PROJECT_SOURCE_DIR}/src/include/server/mir/compositor/stream.h
   multi_monitor_arbiter.cpp
   basic_screen_shooter.cpp
   null_screen_shooter.cpp

src/server/compositor/default_configuration.cpp

@@ -18,7 +18,6 @@
 
 #include "mir/log.h"
 #include "mir/shell/shell.h"
-#include "buffer_stream_factory.h"
 #include "default_display_buffer_compositor_factory.h"
 #include "mir/executor.h"
 #include "multi_threaded_compositor.h"
@@ -33,16 +32,6 @@ namespace mc = mir::compositor;
 namespace ms = mir::scene;
 namespace mg = mir::graphics;
 
-std::shared_ptr<ms::BufferStreamFactory>
-mir::DefaultServerConfiguration::the_buffer_stream_factory()
-{
-    return buffer_stream_factory(
-        []()
-        {
-            return std::make_shared<mc::BufferStreamFactory>();
-        });
-}
-
 std::shared_ptr<mc::DisplayBufferCompositorFactory>
 mir::DefaultServerConfiguration::the_display_buffer_compositor_factory()
 {

src/server/compositor/stream.cpp

@@ -14,15 +14,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "stream.h"
+#include "mir/compositor/stream.h"
+#include "multi_monitor_arbiter.h"
 #include "mir/graphics/buffer.h"
 #include <boost/throw_exception.hpp>
 #include <math.h>
 
 #include <cmath>
 
 namespace mc = mir::compositor;
-namespace geom = mir::geometry;
 namespace mg = mir::graphics;
 namespace geom = mir::geometry;
 

src/server/scene/application_session.cpp

@@ -20,10 +20,9 @@
 #include "mir/scene/session_container.h"
 #include "mir/scene/session_listener.h"
 #include "mir/scene/surface_factory.h"
-#include "mir/scene/buffer_stream_factory.h"
 #include "mir/shell/surface_stack.h"
 #include "mir/shell/surface_specification.h"
-#include "mir/compositor/buffer_stream.h"
+#include "mir/compositor/stream.h"
 #include "mir/events/event_builders.h"
 #include "mir/frontend/event_sink.h"
 #include "mir/graphics/graphic_buffer_allocator.h"
@@ -43,11 +42,11 @@ namespace msh = mir::shell;
 namespace mg = mir::graphics;
 namespace mev = mir::events;
 namespace mc = mir::compositor;
+namespace geom = mir::geometry;
 
 ms::ApplicationSession::ApplicationSession(
     std::shared_ptr<msh::SurfaceStack> const& surface_stack,
     std::shared_ptr<SurfaceFactory> const& surface_factory,
-    std::shared_ptr<ms::BufferStreamFactory> const& buffer_stream_factory,
     pid_t pid,
     Fd socket_fd,
     std::string const& session_name,
@@ -56,7 +55,6 @@ ms::ApplicationSession::ApplicationSession(
     std::shared_ptr<graphics::GraphicBufferAllocator> const& gralloc) :
     surface_stack(surface_stack),
     surface_factory(surface_factory),
-    buffer_stream_factory(buffer_stream_factory),
     pid(pid),
     socket_fd_(socket_fd),
     session_name(session_name),
@@ -292,7 +290,7 @@ void ms::ApplicationSession::resume_prompt_session()
 auto ms::ApplicationSession::create_buffer_stream(mg::BufferProperties const& props)
     -> std::shared_ptr<compositor::BufferStream>
 {
-    auto stream = buffer_stream_factory->create_buffer_stream(props);
+    auto stream = std::make_shared<mc::Stream>(props.size, props.format);
     session_listener->buffer_stream_created(*this, stream);
 
     std::unique_lock lock(surfaces_and_streams_mutex);

src/server/scene/application_session.h

@@ -37,7 +37,6 @@ namespace scene
 {
 class SessionListener;
 class Surface;
-class BufferStreamFactory;
 class SurfaceFactory;
 
 class ApplicationSession : public Session
@@ -46,7 +45,6 @@ class ApplicationSession : public Session
     ApplicationSession(
         std::shared_ptr<shell::SurfaceStack> const& surface_stack,
         std::shared_ptr<SurfaceFactory> const& surface_factory,
-        std::shared_ptr<BufferStreamFactory> const& buffer_stream_factory,
         pid_t pid,
         Fd socket_fd,
         std::string const& session_name,
@@ -99,7 +97,6 @@ class ApplicationSession : public Session
 private:
     std::shared_ptr<shell::SurfaceStack> const surface_stack;
     std::shared_ptr<SurfaceFactory> const surface_factory;
-    std::shared_ptr<BufferStreamFactory> const buffer_stream_factory;
     pid_t const pid;
     Fd socket_fd_;
     std::string const session_name;

src/server/scene/default_configuration.cpp

@@ -176,7 +176,6 @@ mir::DefaultServerConfiguration::the_session_coordinator()
             return std::make_shared<ms::SessionManager>(
                 the_surface_stack(),
                 the_surface_factory(),
-                the_buffer_stream_factory(),
                 the_session_container(),
                 the_session_event_sink(),
                 the_session_listener(),

src/server/scene/session_manager.cpp

@@ -83,7 +83,6 @@ struct ms::SessionManager::SessionObservers : mir::ObserverMultiplexer<ms::Sessi
 ms::SessionManager::SessionManager(
     std::shared_ptr<shell::SurfaceStack> const& surface_stack,
     std::shared_ptr<SurfaceFactory> const& surface_factory,
-    std::shared_ptr<BufferStreamFactory> const& buffer_stream_factory,
     std::shared_ptr<SessionContainer> const& container,
     std::shared_ptr<SessionEventSink> const& session_event_sink,
     std::shared_ptr<SessionListener> const& session_listener,
@@ -94,7 +93,6 @@ ms::SessionManager::SessionManager(
     observers(std::make_shared<SessionObservers>()),
     surface_stack(surface_stack),
     surface_factory(surface_factory),
-    buffer_stream_factory(buffer_stream_factory),
     app_container(container),
     session_event_sink(session_event_sink),
     session_listener(session_listener),
@@ -135,7 +133,6 @@ std::shared_ptr<ms::Session> ms::SessionManager::open_session(
     std::shared_ptr<Session> new_session = std::make_shared<ApplicationSession>(
         surface_stack,
         surface_factory,
-        buffer_stream_factory,
         client_pid,
         socket_fd,
         name,

src/server/scene/session_manager.h

@@ -44,7 +44,6 @@ class SessionEventSink;
 class SessionListener;
 class SurfaceStack;
 class PromptSessionManager;
-class BufferStreamFactory;
 class SurfaceFactory;
 class ApplicationNotRespondingDetector;
 
@@ -54,7 +53,6 @@ class SessionManager : public SessionCoordinator
     SessionManager(
         std::shared_ptr<shell::SurfaceStack> const& surface_stack,
         std::shared_ptr<SurfaceFactory> const& surface_factory,
-        std::shared_ptr<BufferStreamFactory> const& buffer_stream_factory,
         std::shared_ptr<SessionContainer> const& app_container,
         std::shared_ptr<SessionEventSink> const& session_event_sink,
         std::shared_ptr<SessionListener> const& session_listener,
@@ -91,7 +89,6 @@ class SessionManager : public SessionCoordinator
     std::shared_ptr<SessionObservers> const observers;
     std::shared_ptr<shell::SurfaceStack> const surface_stack;
     std::shared_ptr<SurfaceFactory> const surface_factory;
-    std::shared_ptr<BufferStreamFactory> const buffer_stream_factory;
     std::shared_ptr<SessionContainer> const app_container;
     std::shared_ptr<SessionEventSink> const session_event_sink;
     std::shared_ptr<SessionListener> const session_listener;