Mir

Merge lp:~kdub/mir/streams-swapinterval-1 into lp:mir

streams-swapinterval-1
Merge into development-branch

Proposed by Kevin DuBois on 2016-02-09

Status:	Merged
Approved by:	Alan Griffiths on 2016-02-10
Approved revision:	no longer in the source branch.
Merged at revision:	3302
Proposed branch:	lp:~kdub/mir/streams-swapinterval-1
Merge into:	lp:mir
Diff against target:	43 lines (+21/-1) 2 files modified src/server/scene/application_session.cpp (+0/-1) tests/unit-tests/scene/test_application_session.cpp (+21/-0)
To merge this branch:	bzr merge lp:~kdub/mir/streams-swapinterval-1
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2016-02-09
Alan Griffiths		2016-02-09	Approve on 2016-02-09
Mir CI Bot	continuous-integration		Approve on 2016-02-09
Review via email: mp+285476@code.launchpad.net

Commit message

scene: make sure not to set the swapinterval to 0 when an independent stream is created. The default should be 1 (like the stream created as part of surface creation)

Description of the change

scene: make sure not to set the swapinterval to 0 when an independent stream is created. The default should be 1 (like the stream created as part of surface creation)

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-02-09:

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/260/rebuild

review: Approve (continuous-integration)

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2016-02-09:

OK. (I'm just wondering why we ever had the allow_framedropping(true) call.)

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2016-02-09:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/6239/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Emanuele Antonio Faraone

Gerry Boland

Kevin DuBois

Mir development team

 === modified file 'src/server/scene/application_session.cpp'
 --- src/server/scene/application_session.cpp	2016-01-29 08:18:22 +0000
 +++ src/server/scene/application_session.cpp	2016-02-09 13:24:11 +0000
@@ -360,7 +360,6 @@
+ {
      auto const id = static_cast<mf::BufferStreamId>(next_id().as_value());
      auto stream = buffer_stream_factory->create_buffer_stream(id, event_sink, props);
--    stream->allow_framedropping(true);
      std::unique_lock<std::mutex> lock(surfaces_and_streams_mutex);
      streams[id] = stream;
 === modified file 'tests/unit-tests/scene/test_application_session.cpp'
 --- tests/unit-tests/scene/test_application_session.cpp	2016-01-29 08:18:22 +0000
 +++ tests/unit-tests/scene/test_application_session.cpp	2016-02-09 13:24:11 +0000
@@ -612,6 +612,27 @@
      }, std::runtime_error);
+ }
++TEST_F(ApplicationSession, buffer_stream_constructed_with_swapinterval_1)
++{
++    using namespace ::testing;
++
++    geom::Size const buffer_size{geom::Width{1}, geom::Height{1}};
++
++    mtd::MockBufferStream stream;
++    MockBufferStreamFactory factory;
++
++    mg::BufferProperties properties(buffer_size, mir_pixel_format_argb_8888, mg::BufferUsage::software);
++
++    EXPECT_CALL(stream, allow_framedropping(true))
++        .Times(0);
++    EXPECT_CALL(factory, create_buffer_stream(_,_,properties)).Times(1)
++        .WillOnce(Return(mt::fake_shared(stream)));
++
++    auto session = make_application_session_with_buffer_stream_factory(mt::fake_shared(factory));
++    auto id = session->create_buffer_stream(properties);
++    session->destroy_buffer_stream(id);
++}
++
  TEST_F(ApplicationSession, surface_uses_prexisting_buffer_stream_if_set)
+ {
      using namespace testing;