1
=== modified file 'examples/eglapp.c'
2
--- examples/eglapp.c	2016-10-21 07:53:23 +0000
3
+++ examples/eglapp.c	2016-10-27 08:46:44 +0000
4
@@ -37,6 +37,7 @@
5
37
static EGLDisplay egldisplay;
37
static EGLDisplay egldisplay;
6
38
static EGLSurface eglsurface;
38
static EGLSurface eglsurface;
7
39
static volatile sig_atomic_t running = 0;
39
static volatile sig_atomic_t running = 0;
8
40
static double refresh_rate = 0.0;
9
40
41
10
41
#define CHECK(_cond, _err) \
42
#define CHECK(_cond, _err) \
11
42
    if (!(_cond)) \
43
    if (!(_cond)) \
12
@@ -135,12 +136,19 @@
13
135
    unsigned ff = mir_surface_output_event_get_form_factor(out);
136
    unsigned ff = mir_surface_output_event_get_form_factor(out);
14
136
    char const* form_factor = (ff < 6) ? form_factor_name[ff] : "out-of-range";
137
    char const* form_factor = (ff < 6) ? form_factor_name[ff] : "out-of-range";
15
137
138
16
139
    refresh_rate = mir_surface_output_event_get_refresh_rate(out);
17
140
18
138
    printf("Surface is on output %u: %d DPI, scale %.1fx, %s form factor, %.2fHz\n",
141
    printf("Surface is on output %u: %d DPI, scale %.1fx, %s form factor, %.2fHz\n",
19
139
           mir_surface_output_event_get_output_id(out),
142
           mir_surface_output_event_get_output_id(out),
20
140
           mir_surface_output_event_get_dpi(out),
143
           mir_surface_output_event_get_dpi(out),
21
141
           mir_surface_output_event_get_scale(out),
144
           mir_surface_output_event_get_scale(out),
22
142
           form_factor,
145
           form_factor,
24
143
           mir_surface_output_event_get_refresh_rate(out));
146
           refresh_rate);
25
147
}
26
148
27
149
double mir_eglapp_display_hz(void)
28
150
{
29
151
    return refresh_rate;
30
144
}
152
}
31
145
153
32
146
void mir_eglapp_handle_event(MirSurface* surface, MirEvent const* ev, void* unused)
154
void mir_eglapp_handle_event(MirSurface* surface, MirEvent const* ev, void* unused)
33
147
155
34
=== modified file 'examples/eglapp.h'
35
--- examples/eglapp.h	2016-10-21 07:53:23 +0000
36
+++ examples/eglapp.h	2016-10-27 08:46:44 +0000
37
@@ -47,6 +47,7 @@
38
47
mir_eglapp_bool mir_eglapp_running(void);
47
mir_eglapp_bool mir_eglapp_running(void);
39
48
void            mir_eglapp_cleanup(void);
48
void            mir_eglapp_cleanup(void);
40
49
void            mir_eglapp_handle_event(struct MirSurface* surface, struct MirEvent const* ev, void* unused);
49
void            mir_eglapp_handle_event(struct MirSurface* surface, struct MirEvent const* ev, void* unused);
41
50
double          mir_eglapp_display_hz(void);
42
50
51
43
51
struct MirConnection* mir_eglapp_native_connection();
52
struct MirConnection* mir_eglapp_native_connection();
44
52
struct MirSurface*    mir_eglapp_native_surface();
53
struct MirSurface*    mir_eglapp_native_surface();
45
53
54
46
=== modified file 'src/utils/vanity.c'
47
--- src/utils/vanity.c	2016-10-21 07:53:23 +0000
48
+++ src/utils/vanity.c	2016-10-27 08:46:44 +0000
49
@@ -74,6 +74,7 @@
50
74
    bool resized;
74
    bool resized;
51
75
    Camera* camera;
75
    Camera* camera;
52
76
    Time last_change_time;
76
    Time last_change_time;
53
77
    Time last_change_time_error;
54
77
    Time last_change_seen_time;
78
    Time last_change_seen_time;
55
78
    Time display_frame_time;
79
    Time display_frame_time;
56
79
    Buffer const* preview;
80
    Buffer const* preview;
57
@@ -492,6 +493,11 @@
58
492
           )
493
           )
59
493
        {
494
        {
60
494
            Time latency = acquire_time - state->last_change_time;
495
            Time latency = acquire_time - state->last_change_time;
61
496
62
497
            // Correct for swap interval zero dropping buffers the camera
63
498
            // will never see:
64
499
            latency -= state->last_change_time_error;
65
500
66
495
            last_seen_value = see;
501
            last_seen_value = see;
67
496
            state->last_change_seen_time = acquire_time;
502
            state->last_change_seen_time = acquire_time;
68
497
            state->expected_direction = 0;
503
            state->expected_direction = 0;
69
@@ -713,6 +719,7 @@
70
713
        0,
719
        0,
71
714
        0,
720
        0,
72
715
        0,
721
        0,
73
722
        0,
74
716
        NULL,
723
        NULL,
75
717
        0,
724
        0,
76
718
        false
725
        false
77
@@ -833,9 +840,26 @@
78
833
        }
840
        }
79
834
        mir_eglapp_swap_buffers();
841
        mir_eglapp_swap_buffers();
80
835
842
81
843
        double display_hz = mir_eglapp_display_hz();
82
836
        Time swap_time = now();
844
        Time swap_time = now();
83
845
        Time measured_swap_interval = swap_time - last_swap_time;
84
837
        pthread_mutex_lock(&state.mutex);
846
        pthread_mutex_lock(&state.mutex);
86
838
        state.display_frame_time = swap_time - last_swap_time;
847
        if (display_hz > 0.0)  // More steady and works with all intervals:
87
848
        {
88
849
            state.display_frame_time = one_second / display_hz;
89
850
90
851
            // Correct last_change_time for framedropping mode(s) where
91
852
            // we actually render many frames per display frame:
92
853
            if (measured_swap_interval < state.display_frame_time)
93
854
                state.last_change_time_error = state.display_frame_time -
94
855
                                               measured_swap_interval;
95
856
            else
96
857
                state.last_change_time_error = 0;
97
858
        }
98
859
        else
99
860
        {
100
861
            state.display_frame_time = measured_swap_interval;
101
862
        }
102
839
        pthread_mutex_unlock(&state.mutex);
863
        pthread_mutex_unlock(&state.mutex);
103
840
        last_swap_time = swap_time;
864
        last_swap_time = swap_time;
104
841
    }
865
    }
Status:	Merged
Approved by:	Daniel van Vugt on 2016-10-31
Approved revision:	no longer in the source branch.
Merged at revision:	3796
Proposed branch:	lp:~vanvugt/mir/interval-0-is-not-an-error
Merge into:	lp:mir
Diff against target:	104 lines (+35/-2) 3 files modified examples/eglapp.c (+9/-1) examples/eglapp.h (+1/-0) src/utils/vanity.c (+25/-1)
To merge this branch:	bzr merge lp:~vanvugt/mir/interval-0-is-not-an-error
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Chris Halse Rogers		2016-10-27	Approve on 2016-10-31
Mir CI Bot	continuous-integration		Approve on 2016-10-27
Review via email: mp+309435@code.launchpad.net