From 02765c37dae0e452c1e566cf5cfdfc907bf1f04b Mon Sep 17 00:00:00 2001
From: Damien Riegel <damien.riegel@savoirfairelinux.com>
Date: Mon, 31 Aug 2015 10:13:49 -0400
Subject: [PATCH] android/video: set display format to RGBA
On Android, ANativeSurface only supports RGBA, set the format
accordingly. This is the only change required in the daemon to be able
to display video.
Issue: #79814
Change-Id: I1c91bf40013e2cf29377824f4c957cc7ca85d52c
---
src/media/video/sinkclient.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/media/video/sinkclient.cpp b/src/media/video/sinkclient.cpp
index 5c9bb581b8..4409809a14 100644
--- a/src/media/video/sinkclient.cpp
+++ b/src/media/video/sinkclient.cpp
@@ -333,10 +333,10 @@ SinkClient::update(Observable<std::shared_ptr<VideoFrame>>* /*obs*/,
VideoScaler scaler;
const int width = f.width();
const int height = f.height();
-#ifndef __APPLE__
- const int format = VIDEO_PIXFMT_BGRA;
-#else
+#if (defined(__ANDROID__) || defined(__APPLE__))
const int format = VIDEO_PIXFMT_RGBA;
+#else
+ const int format = VIDEO_PIXFMT_BGRA;
#endif
const auto bytes = videoFrameSize(format, width, height);
--
GitLab