1
=== modified file 'src/utils/screencast.cpp'
2
--- src/utils/screencast.cpp	2014-02-17 05:15:06 +0000
3
+++ src/utils/screencast.cpp	2014-02-20 17:19:20 +0000
4
@@ -114,6 +114,8 @@
5
114
    std::cout << "Usage " << std::endl
114
    std::cout << "Usage " << std::endl
6
115
              << "    -m <Mir server socket>" << std::endl
115
              << "    -m <Mir server socket>" << std::endl
7
116
              << "    -o <Output id>" << std::endl
116
              << "    -o <Output id>" << std::endl
8
117
              << "    -n <Number of frames to capture>" << std::endl
9
118
              << "        default (-1) is to capture infinite frames" << std::endl
10
117
              << "    -h: this help text" << std::endl;
119
              << "    -h: this help text" << std::endl;
11
118
}
120
}
12
119
121
13
@@ -198,7 +200,7 @@
14
198
};
200
};
15
199
201
16
200
void do_screencast(MirConnection* connection, MirScreencast* screencast,
202
void do_screencast(MirConnection* connection, MirScreencast* screencast,
18
201
                   uint32_t output_id)
203
                   uint32_t output_id, int32_t number_of_captures)
19
202
{
204
{
20
203
    static int const rgba_pixel_size{4};
205
    static int const rgba_pixel_size{4};
21
204
206
22
@@ -218,7 +220,7 @@
23
218
    ss << (format == GL_BGRA_EXT ? ".bgra" : ".rgba");
220
    ss << (format == GL_BGRA_EXT ? ".bgra" : ".rgba");
24
219
    std::ofstream video_file(ss.str());
221
    std::ofstream video_file(ss.str());
25
220
222
27
221
    while (running)
223
    while (running && (number_of_captures != 0))
28
222
    {
224
    {
29
223
        read_pixels(format, frame_size, frame_data.data());
225
        read_pixels(format, frame_size, frame_data.data());
30
224
226
31
@@ -231,6 +233,9 @@
32
231
        egl_setup.swap_buffers();
233
        egl_setup.swap_buffers();
33
232
234
34
233
        write_out_future.wait();
235
        write_out_future.wait();
35
236
36
237
        if (number_of_captures > 0)
37
238
            number_of_captures--;
38
234
    }
239
    }
39
235
}
240
}
40
236
241
41
@@ -243,14 +248,18 @@
42
243
    opterr = 0;
248
    opterr = 0;
43
244
    char const* socket_file = nullptr;
249
    char const* socket_file = nullptr;
44
245
    uint32_t output_id = mir_display_output_id_invalid;
250
    uint32_t output_id = mir_display_output_id_invalid;
45
251
    int32_t number_of_captures = -1;
46
246
252
47
247
    //avoid unused warning/error
253
    //avoid unused warning/error
48
248
    tls_hack[0] = 0;
254
    tls_hack[0] = 0;
49
249
255
51
250
    while ((arg = getopt (argc, argv, "hm:o:")) != -1)
256
    while ((arg = getopt (argc, argv, "hm:o:n:")) != -1)
52
251
    {
257
    {
53
252
        switch (arg)
258
        switch (arg)
54
253
        {
259
        {
55
260
        case 'n':
56
261
            number_of_captures = std::stoi(std::string(optarg)); 
57
262
            break;
58
254
        case 'm':
263
        case 'm':
59
255
            socket_file = optarg;
264
            socket_file = optarg;
60
256
            break;
265
            break;
61
@@ -303,13 +312,18 @@
62
303
    if (screencast == nullptr)
312
    if (screencast == nullptr)
63
304
        throw std::runtime_error("Failed to create screencast");
313
        throw std::runtime_error("Failed to create screencast");
64
305
314
66
306
    do_screencast(connection.get(), screencast.get(), output_id);
315
    do_screencast(connection.get(), screencast.get(), output_id, number_of_captures);
67
307
316
68
308
    return EXIT_SUCCESS;
317
    return EXIT_SUCCESS;
69
309
}
318
}
70
319
catch(std::invalid_argument const& e)
71
320
{
72
321
    std::cerr << "Invalid Argument" << std::endl;
73
322
    print_usage();
74
323
    return EXIT_FAILURE;
75
324
}
76
310
catch(std::exception const& e)
325
catch(std::exception const& e)
77
311
{
326
{
78
312
    std::cerr << e.what() << std::endl;
327
    std::cerr << e.what() << std::endl;
79
313
80
314
    return EXIT_FAILURE;
328
    return EXIT_FAILURE;
81
315
}
329
}
Status:	Merged
Approved by:	Kevin DuBois on 2014-02-21
Approved revision:	no longer in the source branch.
Merged at revision:	1416
Proposed branch:	lp:~kdub/mir/mirscreencast-limited-capture
Merge into:	lp:mir
Diff against target:	81 lines (+19/-5) 1 file modified src/utils/screencast.cpp (+19/-5)
To merge this branch:	bzr merge lp:~kdub/mir/mirscreencast-limited-capture
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2014-02-21
Alberto Aguirre (community)		2014-02-19	Approve on 2014-02-20
Alan Griffiths			Approve on 2014-02-20
Review via email: mp+207314@code.launchpad.net