Merge lp:~kdub/mir/fix-1662997-0.26.1 into lp:~mir-team/mir/0.26-old

[Kevin DuBois]

fix mirscreencast by making sure it knows enough about pixel format to create its buffers.

fixes: LP: #1662997

fix mirscreencast by making sure it knows enough about pixel format to create its buffers.

fixes: LP: #1662997

[Cemil Azizoglu (cemil-azizoglu)]

Ok

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2017-02-08 14:53:57 +0000
+++ debian/changelog	2017-02-08 20:31:43 +0000
@@ -42,6 +42,7 @@
       . Mir graphics platform ABI broke in series 0.26 but sonames never
         changed (LP: #1662455)
       . Fixes for 0.26 changelog.
+      . [regression] mirscreencast hangs during screencast creation (LP: #1662997)
 
  -- Cemil Azizoglu <[e-mail]>  Thu, 02 Feb 2017 17:34:17 -0600
 
 
=== modified file 'src/client/mir_screencast.cpp'
--- src/client/mir_screencast.cpp	2017-01-24 07:37:03 +0000
+++ src/client/mir_screencast.cpp	2017-02-08 20:31:43 +0000
@@ -183,8 +183,17 @@
     if (!protobuf_screencast->has_error() && connection)
     {
         std::lock_guard<decltype(mutex)> lock(mutex);
-        buffer_stream = connection->make_consumer_stream(
-            protobuf_screencast->buffer_stream());
+        try
+        {
+            buffer_stream = connection->make_consumer_stream(
+                protobuf_screencast->buffer_stream());
+        }
+        catch (...)
+        {
+            callback(nullptr, context);
+            create_screencast_wait_handle.result_received();
+            return;
+        }
     }
 
     callback(this, context);
 
=== modified file 'src/server/frontend/session_mediator.cpp'
--- src/server/frontend/session_mediator.cpp	2017-02-03 16:39:16 +0000
+++ src/server/frontend/session_mediator.cpp	2017-02-08 20:31:43 +0000
@@ -832,6 +832,7 @@
 
     protobuf_screencast->mutable_screencast_id()->set_value(
         screencast_session_id.as_value());
+    protobuf_screencast->mutable_buffer_stream()->set_pixel_format(pixel_format);
     protobuf_screencast->mutable_buffer_stream()->mutable_id()->set_value(
         screencast_session_id.as_value());
 
 
=== modified file 'tests/unit-tests/frontend/test_session_mediator.cpp'
--- tests/unit-tests/frontend/test_session_mediator.cpp	2017-02-02 18:25:05 +0000
+++ tests/unit-tests/frontend/test_session_mediator.cpp	2017-02-08 20:31:43 +0000
@@ -569,6 +569,7 @@
     mp::ScreencastParameters screencast_parameters;
     mp::Screencast screencast;
     auto const& stub_buffer = stub_screencast->stub_buffer;
+    screencast_parameters.set_pixel_format(stub_buffer.pixel_format());
 
     EXPECT_CALL(mock_ipc_operations, pack_buffer(_, Ref(stub_buffer), mg::BufferIpcMsgType::full_msg));
 
@@ -576,6 +577,8 @@
                                &screencast, null_callback.get());
     EXPECT_EQ(static_cast<int>(stub_buffer.id().as_value()),
               screencast.buffer_stream().buffer().buffer_id());
+    //LP: #1662997
+    EXPECT_THAT(screencast.buffer_stream().pixel_format(), Eq(stub_buffer.pixel_format()));
 }
 
 TEST_F(SessionMediator, eventually_partially_packs_screencast_buffer)