← Back to branch summary

~alan-griffiths/mir/verify-smoke-test-runs-ok

« back to all changes in this revision

Viewing changes to src/client/screencast_stream.cpp

  • Committer: Daniel van Vugt
  • Date: 2016-03-14 10:13:49 UTC
  • mfrom: (3385 development-branch)
  • mto: This revision was merged to the branch mainline in revision 3398.
  • Revision ID: daniel.van.vugt@canonical.com-20160314101349-olm4fbs915d60nfo
Merge latest trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/client/screencast_stream.cpp
22
22
#include "rpc/mir_display_server.h"
23
23
#include "mir_protobuf.pb.h"
24
24
#include "buffer_vault.h"
 
25
#include "protobuf_to_native_buffer.h"
25
26
 
26
27
#include "mir/log.h"
27
28
#include "mir/client_platform.h"
88
89
    if (buffer.has_width() && buffer.has_height())
89
90
        buffer_size = geom::Size{buffer.width(), buffer.height()};
90
91
 
91
 
    auto package = std::make_shared<MirBufferPackage>();
92
 
    package->data_items = buffer.data_size();
93
 
    package->fd_items = buffer.fd_size();
94
 
    for (int i = 0; i != buffer.data_size(); ++i)
95
 
        package->data[i] = buffer.data(i);
96
 
    for (int i = 0; i != buffer.fd_size(); ++i)
97
 
        package->fd[i] = buffer.fd(i);
98
 
    package->stride = buffer.stride();
99
 
    package->flags = buffer.flags();
100
 
    package->width = buffer.width();
101
 
    package->height = buffer.height();
102
92
    if (current_id != buffer.buffer_id())
103
93
    {
104
94
        try
105
95
        {
106
96
            current_buffer = factory->create_buffer(
107
 
                package, buffer_size, static_cast<MirPixelFormat>(protobuf_bs->pixel_format()));
 
97
                mcl::protobuf_to_native_buffer(buffer),
 
98
                buffer_size, static_cast<MirPixelFormat>(protobuf_bs->pixel_format()));
108
99
        }
109
100
        catch (const std::runtime_error& error)
110
101
        {