Merge lp:~cemil-azizoglu/mir/refine-display-format-selection-on-android into lp:mir

[Cemil Azizoglu]

Fixes lp:1584657 by refining the display format selection for HWC. The algorithm used is closer to what Android uses.

Fixes lp:1584657 by refining the display format selection for HWC. The algorithm used is closer to what Android uses.

Did regression testing to make sure the change in algorithm doesn't affect other devices. Here are the results : http://pastebin.ubuntu.com/17721006/

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:3549
https://mir-jenkins.ubuntu.com/job/mir-ci/1174/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/1321
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1372
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1363
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/1363
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1335
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1335/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/1335
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/1335/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1335
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1335/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1335
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1335/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/1335
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/1335/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Alexandros Frantzis (afrantzis)]

Looks good.

review: Approve

[Mir CI Bot (mir-ci-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
https://mir-jenkins.ubuntu.com/job/mir-autolanding/330/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/1328/console
    None: https://mir-jenkins.ubuntu.com/job/generic-land-mp/356/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1379
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1370
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/1370
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1342
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1342/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/1342
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/1342/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1342/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1342/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/1342/console

review: Needs Fixing (continuous-integration)

[Kevin DuBois (kdub)]

lgtm, although HwcConfiguration.fb_format_selection could be updated

review: Approve

[Mir CI Bot (mir-ci-bot)]

review: Approve (continuous-integration)

=== modified file 'src/platforms/android/server/hwc_blanking_control.cpp'
--- src/platforms/android/server/hwc_blanking_control.cpp	2016-01-29 08:18:22 +0000
+++ src/platforms/android/server/hwc_blanking_control.cpp	2016-06-22 22:51:59 +0000
@@ -28,6 +28,9 @@
 #include <system_error>
 #include <chrono>
 
+#define MIR_LOG_COMPONENT "android/server"
+#include "mir/log.h"
+
 namespace mg = mir::graphics;
 namespace mga = mir::graphics::android;
 namespace geom = mir::geometry;
@@ -41,6 +44,10 @@
         EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
         EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
         EGL_FRAMEBUFFER_TARGET_ANDROID, EGL_TRUE,
+        EGL_RECORDABLE_ANDROID, EGL_TRUE,
+        EGL_RED_SIZE, 8,
+        EGL_GREEN_SIZE, 8,
+        EGL_BLUE_SIZE, 8,
         EGL_NONE
     };
 
@@ -57,14 +64,19 @@
         int visual_id;
         eglGetConfigAttrib(egl_display, fb_egl_config, EGL_NATIVE_VISUAL_ID, &visual_id);
         fb_format = mga::to_mir_format(visual_id);
+        mir::log_info("Found %d matching egl configs", matching_configs);
+        mir::log_info("Android visual ID for selected display format : %d", visual_id);
     }
     else
     {
+        mir::log_info("No matching egl configs found");
         //we couldn't figure out the fb format via egl. In this case, we
         //assume abgr_8888. HWC api really should provide this information directly.
         fb_format = mir_pixel_format_abgr_8888;
     }
 
+    mir::log_info("Selected Mir display format : %d", fb_format);
+
     eglTerminate(egl_display);
     return fb_format;
 }

=== modified file 'tests/unit-tests/graphics/android/test_hwc_configuration.cpp'
--- tests/unit-tests/graphics/android/test_hwc_configuration.cpp	2015-06-25 03:00:08 +0000
+++ tests/unit-tests/graphics/android/test_hwc_configuration.cpp	2016-06-22 22:51:59 +0000
@@ -41,11 +41,16 @@
 {
     using namespace testing;
     Mock::VerifyAndClearExpectations(&mock_egl);
+    // Should match what's in determine_hwc_fb_format() in hwc_blanking_control.cpp
     EGLint const expected_egl_config_attr [] =
     {
         EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
         EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
         EGL_FRAMEBUFFER_TARGET_ANDROID, EGL_TRUE,
+        EGL_RECORDABLE_ANDROID, EGL_TRUE,
+        EGL_RED_SIZE, 8,
+        EGL_GREEN_SIZE, 8,
+        EGL_BLUE_SIZE, 8,
         EGL_NONE
     };