From 97d985d2dfc27e152721d539c5eb1704d015bbdc Mon Sep 17 00:00:00 2001
From: Marco Nelissen <marcone@google.com>
Date: Thu, 28 Jan 2016 21:40:56 +0000
Subject: Revert "Get codec from codec process"

This reverts commit db1d696afda13079daeeb584f086eaa49cb82825.

Change-Id: I3dcae785842bcdbed87f846fef744c756a133df4
---
 src/android/VideoCodec_to_android.cpp | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/android/VideoCodec_to_android.cpp b/src/android/VideoCodec_to_android.cpp
index 322e47e..0d5dd22 100644
--- a/src/android/VideoCodec_to_android.cpp
+++ b/src/android/VideoCodec_to_android.cpp
@@ -16,12 +16,11 @@
 
 #include "sles_allinclusive.h"
 
-#include <media/IMediaCodecService.h>
+#include <media/IMediaPlayerService.h>
 #include <media/stagefright/OMXClient.h>
 #include <media/stagefright/OMXCodec.h>
 #include <media/IOMX.h>
 #include <media/stagefright/MediaDefs.h>
-#include <binder/IServiceManager.h>
 
 
 namespace android {
@@ -59,11 +58,7 @@ XAuint32 convertOpenMaxIlToAl(OMX_U32 ilVideoProfileOrLevel) {
 bool android_videoCodec_expose() {
     SL_LOGV("android_videoCodec_expose()");
 
-    //sp<IMediaPlayerService> service(IMediaDeathNotifier::getMediaPlayerService());
-    sp<IServiceManager> sm = defaultServiceManager();
-    sp<IBinder> binder = sm->getService(String16("media.codec"));
-    sp<IMediaCodecService> service = interface_cast<IMediaCodecService>(binder);
-
+    sp<IMediaPlayerService> service(IMediaDeathNotifier::getMediaPlayerService());
     if (service == NULL) {
         // no need to SL_LOGE; getMediaPlayerService already will have done so
         return false;
-- 
cgit v1.2.3


From 837ca2ba34b9b842bd2e5bf2920af581c3bd8f8d Mon Sep 17 00:00:00 2001
From: ilewis <inl@google.com>
Date: Wed, 3 Feb 2016 08:07:15 -0800
Subject: Missing parentheses around #define.

Change-Id: I4f945c9b5a882b2a787c233e1996fe29e52f9b9d
---
 src/android/channels.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/android/channels.h b/src/android/channels.h
index c154565..7ba2dab 100644
--- a/src/android/channels.h
+++ b/src/android/channels.h
@@ -24,7 +24,7 @@
 #define SL_ANDROID_INDEXED_SPEAKER_MASK_ALL     ((SLuint32) \
                                                 ((1 << SL_ANDROID_SPEAKER_COUNT_MAX) - 1))
 #define SL_ANDROID_POSITIONAL_SPEAKER_MASK_ALL  \
-        SL_SPEAKER_FRONT_LEFT \
+        ( SL_SPEAKER_FRONT_LEFT \
         | SL_SPEAKER_FRONT_RIGHT \
         | SL_SPEAKER_FRONT_CENTER \
         | SL_SPEAKER_LOW_FREQUENCY \
@@ -41,7 +41,7 @@
         | SL_SPEAKER_TOP_FRONT_RIGHT \
         | SL_SPEAKER_TOP_BACK_LEFT \
         | SL_SPEAKER_TOP_BACK_CENTER \
-        | SL_SPEAKER_TOP_BACK_RIGHT
+        | SL_SPEAKER_TOP_BACK_RIGHT )
 
 // Channel count and channel mask definitions
 
-- 
cgit v1.2.3


From ae90950dfac39a1d047f92fe050479a715a73af9 Mon Sep 17 00:00:00 2001
From: Lajos Molnar <lajos@google.com>
Date: Thu, 11 Feb 2016 17:29:58 -0800
Subject: unblock infinite loop when enumerating video codecs

Bug: 27115713
Change-Id: I5ff243ef633bd1419d58df3f964536f60002955f
---
 src/android/VideoCodec_to_android.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/android/VideoCodec_to_android.cpp b/src/android/VideoCodec_to_android.cpp
index cca86eb..ce0d0d6 100644
--- a/src/android/VideoCodec_to_android.cpp
+++ b/src/android/VideoCodec_to_android.cpp
@@ -69,7 +69,7 @@ bool android_videoCodec_expose() {
     NbSupportedDecoderTypes = 0;
     for (size_t m = 0 ; m < kNbVideoMimeTypes ; m++) {
         VideoDecoderNbProfLevel[m] = 0;
-        for (ssize_t index = 0;;) {
+        for (ssize_t index = 0;; ++index) {
             index = list->findCodecByType(
                     kVideoMimeTypes[m], false /* encoder */, index);
             if (index < 0) {
-- 
cgit v1.2.3