~ubuntu-branches/ubuntu/utopic/mir/utopic-proposed

[ Kevin Gunn ]
* Cherry-picked from future release 0.1.6:
  - frontend, shell: provide the client process ID in the shell::Session
    interface (LP: #1276704)
* New upstream release 0.1.5 (https://launchpad.net/mir/+milestone/0.1.5)
  - mirclient ABI bumped to 7
  - mirserver ABI bumped to 15
  - Refactoring to support client-controled RPC.
  - Add an translucent server example (use sparingly, this will kill
    performance!)
  - Add workaround for Qualcomm Snapdragon 8960 driver bug.
  - android-input: Improve debug output
  - Screen rotation support half done (rotation of the screen works but input
    rotation not implemented yet).
  - Add groundwork for overlay support to take better advantage of mobile
    hardware features and optimize composition in future.
  - Add support for HWC 1.2 (Android 4.4)
  - Add groundwork for screencasting (screen recording).
  - Optimized surface resizing, significantly reducing event flooding for
    some input configurations like touch.
  - Bugs fixed:
    . Surfaces no longer visible at all on Nexus 10 (LP: #1271853)
    . mir nested server failure: what(): error binding buffer to texture
      (LP: #1272041)
    . Unity does not process events from evdev device created before unity is
      restarted (autopilot tests) (LP: #1238417)
    . mir_unit_tests can't run on touch images any more (missing
      libumockdev.so.0) (LP: #1271434)
    . chmod 777 /tmp/mir_socket is no longer sufficient for non-root clients
      to connect to a root server (LP: #1272143)
    . Nexus7(2013) flo framerate maxes out at 30fps (LP: #1274189)
    . libmirserver user is unable to #include
       <mir/frontend/template_protobuf_message_processor.h> (LP: #1276162)
    . libmirclient user cannot "#include <mir/client/private.h>"
      (LP: #1276565)
    . AndroidInternalClient.internal_client_creation_and_use hangs on Nexus
      10 (LP: #1270685)
    . Tests that use the InProcessServer bind the default socket file
      (LP: #1271604)
    . BasicConnector threads exit immediately (LP: #1271655)
    . Integration tests TestClientIPCRender.test_accelerated_render fails on
      Galaxy Nexus and Nexus4 (LP: #1272597)
    . Android backend unit-tests FTBS on amd64 (LP: #1276621)
    . Erroneous use of last_consumed in SwitchingBundle::compositor_acquire
      (LP: #1270964)

files added:
debian/libmirclient7.install

debian/libmirserver15.install

include/server/mir/frontend/screencast.h

include/test/mir_test_doubles/mock_screencast.h

include/test/mir_test_doubles/null_screencast.h

src/utils/screencast.cpp

tests/integration-tests/client/test_screencast.cpp

files removed:
debian/libmirclient6.install

debian/libmirserver14.install

files modified:
CMakeLists.txt

debian/changelog

debian/control

debian/mir-utils.install

examples/demo-inprocess-surface-client/inprocess_egl_client.cpp

examples/render_surfaces.cpp

include/platform/mir/graphics/display.h

include/server/mir/compositor/buffer_stream.h

include/server/mir/default_server_configuration.h

include/server/mir/frontend/message_processor.h

include/server/mir/frontend/shell.h

include/server/mir/frontend/surface.h

include/server/mir/frontend/template_protobuf_message_processor.h

include/server/mir/shell/session.h

include/shared/mir/int_wrapper.h

include/test/mir_test_doubles/mock_buffer_bundle.h

include/test/mir_test_doubles/mock_buffer_stream.h

include/test/mir_test_doubles/mock_display.h

include/test/mir_test_doubles/mock_fb_hal_device.h

include/test/mir_test_doubles/mock_frontend_surface.h

include/test/mir_test_doubles/mock_hwc_composer_device_1.h

include/test/mir_test_doubles/mock_shell.h

include/test/mir_test_doubles/mock_shell_session.h

include/test/mir_test_doubles/null_display.h

include/test/mir_test_doubles/stub_buffer_stream.h

include/test/mir_test_doubles/stub_display_configuration.h

include/test/mir_test_doubles/stub_ipc_factory.h

include/test/mir_test_doubles/stub_shell.h

include/test/mir_test_doubles/stub_shell_session.h

src/client/CMakeLists.txt

src/client/mir_screencast.cpp

src/client/mir_screencast.h

src/client/mir_screencast_api.cpp

src/client/rpc/mir_socket_rpc_channel.cpp

src/platform/graphics/android/android_alloc_adaptor.cpp

src/platform/graphics/android/android_display.cpp

src/platform/graphics/android/android_display.h

src/platform/graphics/android/android_platform.cpp

src/platform/graphics/android/display_buffer.h

src/platform/graphics/android/hwc_device.cpp

src/platform/graphics/android/hwc_device.h

src/platform/graphics/android/hwc_layers.cpp

src/platform/graphics/android/internal_client_window.cpp

src/platform/graphics/android/output_builder.cpp

src/platform/graphics/android/output_builder.h

src/platform/graphics/android/resource_factory.cpp

src/platform/graphics/android/server_render_window.cpp

src/platform/graphics/mesa/display.cpp

src/platform/graphics/mesa/display.h

src/server/CMakeLists.txt

src/server/compositor/buffer_bundle.h

src/server/compositor/buffer_stream_surfaces.cpp

src/server/compositor/buffer_stream_surfaces.h

src/server/compositor/default_configuration.cpp

src/server/compositor/switching_bundle.cpp

src/server/compositor/switching_bundle.h

src/server/display_server.cpp

src/server/frontend/default_configuration.cpp

src/server/frontend/protobuf_ipc_factory.h

src/server/frontend/protobuf_message_processor.cpp

src/server/frontend/protobuf_message_processor.h

src/server/frontend/protobuf_session_creator.cpp

src/server/frontend/session_mediator.cpp

src/server/frontend/session_mediator.h

src/server/frontend/surface.cpp

src/server/graphics/nested/nested_display.cpp

src/server/graphics/nested/nested_display.h

src/server/graphics/offscreen/display.cpp

src/server/graphics/offscreen/display.h

src/server/scene/application_session.cpp

src/server/scene/application_session.h

src/server/scene/basic_surface.cpp

src/server/scene/basic_surface.h

src/server/scene/session_manager.cpp

src/server/scene/session_manager.h

src/server/scene/surface_impl.cpp

src/server/scene/surface_impl.h

src/utils/CMakeLists.txt

tests/acceptance-tests/test_client_screencast.cpp

tests/acceptance-tests/test_display_configuration.cpp

tests/acceptance-tests/test_protobuf.cpp

tests/acceptance-tests/test_surfaces_with_output_id.cpp

tests/draw/android_graphics.cpp

tests/integration-tests/client/CMakeLists.txt

tests/integration-tests/compositor/test_buffer_stream.cpp

tests/integration-tests/compositor/test_swapping_swappers.cpp

tests/integration-tests/graphics/android/test_buffer_integration.cpp

tests/integration-tests/graphics/android/test_display_integration.cpp

tests/integration-tests/graphics/android/test_internal_client.cpp

tests/integration-tests/test_display_server_main_loop_events.cpp

tests/integration-tests/test_session.cpp

tests/integration-tests/test_session_manager.cpp

tests/integration-tests/test_swapinterval.cpp

tests/mir_test_framework/stubbed_server_configuration.cpp

tests/unit-tests/client/test_mir_screencast.cpp

tests/unit-tests/compositor/test_buffer_stream.cpp

tests/unit-tests/compositor/test_switching_bundle.cpp

tests/unit-tests/compositor/test_temporary_buffers.cpp

tests/unit-tests/frontend/test_session_mediator.cpp

tests/unit-tests/frontend/test_session_mediator_android.cpp

tests/unit-tests/frontend/test_session_mediator_mesa.cpp

tests/unit-tests/frontend/test_socket_session.cpp

tests/unit-tests/graphics/android/test_android_alloc_adaptor.cpp

tests/unit-tests/graphics/android/test_buffer_tex_bind.cpp

tests/unit-tests/graphics/android/test_hwc_common_device.cpp

tests/unit-tests/graphics/android/test_hwc_device.cpp

tests/unit-tests/graphics/android/test_output_builder.cpp

tests/unit-tests/graphics/mesa/test_display_configuration.cpp

tests/unit-tests/scene/test_application_session.cpp

tests/unit-tests/scene/test_session_manager.cpp

tests/unit-tests/scene/test_surface.cpp

tests/unit-tests/scene/test_surface_impl.cpp

tests/unit-tests/scene/test_surface_stack.cpp

tests/unit-tests/shell/test_graphics_display_layout.cpp

Show diffs side-by-side

added added

removed removed

tests/unit-tests/client/test_mir_screencast.cpp

void create_screencast(

google::protobuf::RpcController* /*controller*/,

mp::ScreencastParameters const* /*request*/,

mp::Screencast* /*response*/,

mp::Screencast* response,

google::protobuf::Closure* done) override

{

if (server_thread.joinable())

server_thread.join();

server_thread = std::thread{[done, this] { done->Run(); }};

server_thread = std::thread{

[response, done, this]

{

response->clear_error();

done->Run();

}};

}

void release_screencast(

151

156

152

157

ACTION_P(SetCreateScreencastId, screencast_id)

153

158

{

159

arg2->clear_error();

154

160

arg2->mutable_screencast_id()->set_value(screencast_id);

155

161

}

156

162

166

172

167

173

ACTION_P(SetCreateBufferFromPackage, package)

168

174

{

175

arg2->clear_error();

169

176

auto buffer = arg2->mutable_buffer();

170

177

for (int i = 0; i != package.data_items; ++i)

171

178

{

180

187

buffer->set_stride(package.stride);

181

188

}

182

189

190

ACTION(SetCreateError)

191

{

192

arg2->set_error("Test error");

193

}

194

183

195

ACTION(RunClosure)

184

196

{

185

197

arg3->Run();

521

533

522

534

EXPECT_EQ(StubEGLNativeWindowFactory::egl_native_window, egl_native_window);

523

535

}

536

537

TEST_F(MirScreencastTest, is_invalid_if_server_create_screencast_fails)

538

{

539

using namespace testing;

540

541

EXPECT_CALL(mock_server, create_screencast(_,_,_,_))

542

.WillOnce(DoAll(SetCreateError(), RunClosure()));

543

544

MirScreencast screencast{

545

default_mir_output, mock_server,

546

stub_egl_native_window_factory,

547

stub_client_buffer_factory,

548

null_callback_func, nullptr};

549

550

screencast.creation_wait_handle()->wait_for_all();

551

552

EXPECT_FALSE(screencast.valid());

553

}

554

555

TEST_F(MirScreencastTest, calls_callback_on_creation_failure)

556

{

557