Merge ~vicamo/libhybris/+git/libhybris:for-libhybris-maintainers/bug-1619107/media-service-for-32-bit-codecs into ~libhybris-maintainers/libhybris/+git/libhybris:master

[You-Sheng Yang]

Bring back 32-bit media.service so that 64-bit Ubuntu processes may access codecs correctly.

[You-Sheng Yang (vicamo)]

So far codec listing works internally, but not for libhybris. The Bp part of a MediaCodec is returned as a shared pointer, and while we have:

  return MediaCodecList::getInstance()->getCodecInfo(index)->getCodecName();

The returned string pointer will be invalidated right after the return statement because nobody holds a reference to that MediaCodec shared pointer, and it desctructs itself right away.

[You-Sheng Yang (vicamo)]

[push b9b51b7] support compiling under i386/x86_64 as well.

[Simon Fels (morphis)]

LGTM, do you need anymore changes on this or can we merge this?

review: Approve

[You-Sheng Yang (vicamo)]

Failed to perform video capturing with https://code.launchpad.net/~vicamo/avila-private/+git/platform_frameworks_av/+merge/308820 . Still debugging.

[You-Sheng Yang (vicamo)]

[push b3c1b3d] 1. wrap header import as well. 2. remove bug link for private project.

[You-Sheng Yang (vicamo)]

@Simon, fixed mp for frameworks/av. It's safe for both vivid-armhf and xenial-arm64 now.

Unmerged commits

b3c1b3d... by You-Sheng Yang on 2016-10-19

media: add media.service when necessary

Vendor codecs are usually only available under arm32 flavor. When running in
arm64 ubuntu, MediaCodecList will try to load codecs of arm64, which is
then certainly unavailable. In order to use codecs of a different
architecture, we'll need some kind of process gap and IPC to call remote
procedures. The original Android media service meets the purpose well,
so we have to enable it for such dual-arch setup.

b9b51b7... by Simon Fels on 2016-08-19

Merge remote-tracking branch 'lp/master' into stable

839cb9c... by Simon Fels on 2016-08-09

Merge branch 'master' into stable

0692f89... by Simon Fels on 2016-04-13

Merge branch 'master' into stable

3b7f20d... by Simon Fels on 2016-03-08

Merge branch 'master' into stable

ca92d8c... by Simon Fels on 2016-03-02

Merge branch 'master' into stable

3893cca... by Simon Fels on 2016-01-07

debian: update changelog

9ed4990... by Simon Fels on 2016-01-07

Merge remote-tracking branch 'lp/master' into stable

diff --git a/compat/media/Android.mk b/compat/media/Android.mk
index 2894983..2bd214e 100644
--- a/compat/media/Android.mk
+++ b/compat/media/Android.mk
@@ -38,6 +38,9 @@ ifdef TARGET_2ND_ARCH
 LOCAL_MULTILIB := both
 LOCAL_MODULE_STEM_32 := $(if $(filter false,$(BOARD_UBUNTU_PREFER_32_BIT)),$(LOCAL_MODULE)$(TARGET_2ND_ARCH_MODULE_SUFFIX),$(LOCAL_MODULE))
 LOCAL_MODULE_STEM_64 := $(if $(filter false,$(BOARD_UBUNTU_PREFER_32_BIT)),$(LOCAL_MODULE),$(LOCAL_MODULE)_64)
+ifneq ($(filter-out $(TARGET_2ND_ARCH),$(BOARD_UBUNTU_ARCH)),)
+LOCAL_CFLAGS += -DWITH_MEDIA_PLAYER_SERVICE
+endif
 endif
 
 include $(BUILD_EXECUTABLE)
diff --git a/compat/media/camera_service.cpp b/compat/media/camera_service.cpp
index 38bec4b..5f933df 100644
--- a/compat/media/camera_service.cpp
+++ b/compat/media/camera_service.cpp
@@ -20,6 +20,9 @@
 #undef LOG_TAG
 #define LOG_TAG "CameraServiceCompatLayer"
 
+#if defined(WITH_MEDIA_PLAYER_SERVICE)
+#include <MediaPlayerService.h>
+#endif
 #include "media_recorder_factory.h"
 #include "media_recorder.h"
 
@@ -41,6 +44,9 @@ int main(int argc, char** argv)
 
     ALOGV("Starting camera services (MediaRecorderFactory, CameraRecordService & CameraService)");
 
+#if defined(WITH_MEDIA_PLAYER_SERVICE)
+    MediaPlayerService::instantiate();
+#endif
     // Instantiate the in-process MediaRecorderFactory which is responsible
     // for creating a new IMediaRecorder (MediaRecorder) instance over Binder
     MediaRecorderFactory::instantiate();