TIF: fix TvInputHal bug for multiple devices

In addition, add toString() method to TvStreamConfig for easier
debugging.

Bug: 16561829, Bug: 16666251
Change-Id: Ic192aef30f4d193b73bac7bc93a1563aa9af4377

diff --git a/media/java/android/media/tv/TvStreamConfig.java b/media/java/android/media/tv/TvStreamConfig.java
index 243f864..a7e7e44 100644 (file)
--- a/media/java/android/media/tv/TvStreamConfig.java
+++ b/media/java/android/media/tv/TvStreamConfig.java
@@ -88,6 +88,16 @@ public class TvStreamConfig implements Parcelable {
         return mGeneration;
     }
 
+    @Override
+    public String toString() {
+        StringBuilder b = new StringBuilder(128);
+        b.append("TvStreamConfig {");
+        b.append("mStreamId=").append(mStreamId).append(";");
+        b.append("mType=").append(mType).append(";");
+        b.append("mGeneration=").append(mGeneration).append("}");
+        return b.toString();
+    }
+
     // Parcelable
     @Override
     public int describeContents() {

diff --git a/services/core/java/com/android/server/tv/TvInputHal.java b/services/core/java/com/android/server/tv/TvInputHal.java
index c6213f9..e7dd82d 100644 (file)
--- a/services/core/java/com/android/server/tv/TvInputHal.java
+++ b/services/core/java/com/android/server/tv/TvInputHal.java
@@ -23,6 +23,8 @@ import android.os.HandlerThread;
 import android.os.Message;
 import android.view.Surface;
 import android.util.Slog;
+import android.util.SparseArray;
+import android.util.SparseIntArray;
 
 import java.util.LinkedList;
 import java.util.Queue;
@@ -62,58 +64,70 @@ final class TvInputHal implements Handler.Callback {
             int generation);
     private static native void nativeClose(long ptr);
 
+    private Object mLock = new Object();
     private long mPtr = 0;
     private final Callback mCallback;
     private final Handler mHandler;
-    private int mStreamConfigGeneration = 0;
-    private TvStreamConfig[] mStreamConfigs;
+    private SparseIntArray mStreamConfigGenerations = new SparseIntArray();
+    private SparseArray<TvStreamConfig[]> mStreamConfigs = new SparseArray<>();;
 
     public TvInputHal(Callback callback) {
         mCallback = callback;
         mHandler = new Handler(this);
     }
 
-    public synchronized void init() {
-        mPtr = nativeOpen();
+    public void init() {
+        synchronized (mLock) {
+            mPtr = nativeOpen();
+        }
     }
 
-    public synchronized int addStream(int deviceId, Surface surface, TvStreamConfig streamConfig) {
-        if (mPtr == 0) {
-            return ERROR_NO_INIT;
-        }
-        if (mStreamConfigGeneration != streamConfig.getGeneration()) {
-            return ERROR_STALE_CONFIG;
-        }
-        if (nativeAddStream(mPtr, deviceId, streamConfig.getStreamId(), surface) == 0) {
-            return SUCCESS;
-        } else {
-            return ERROR_UNKNOWN;
+    public int addStream(int deviceId, Surface surface, TvStreamConfig streamConfig) {
+        synchronized (mLock) {
+            if (mPtr == 0) {
+                return ERROR_NO_INIT;
+            }
+            int generation = mStreamConfigGenerations.get(deviceId, 0);
+            if (generation != streamConfig.getGeneration()) {
+                return ERROR_STALE_CONFIG;
+            }
+            if (nativeAddStream(mPtr, deviceId, streamConfig.getStreamId(), surface) == 0) {
+                return SUCCESS;
+            } else {
+                return ERROR_UNKNOWN;
+            }
         }
     }
 
-    public synchronized int removeStream(int deviceId, TvStreamConfig streamConfig) {
-        if (mPtr == 0) {
-            return ERROR_NO_INIT;
-        }
-        if (mStreamConfigGeneration != streamConfig.getGeneration()) {
-            return ERROR_STALE_CONFIG;
-        }
-        if (nativeRemoveStream(mPtr, deviceId, streamConfig.getStreamId()) == 0) {
-            return SUCCESS;
-        } else {
-            return ERROR_UNKNOWN;
+    public int removeStream(int deviceId, TvStreamConfig streamConfig) {
+        synchronized (mLock) {
+            if (mPtr == 0) {
+                return ERROR_NO_INIT;
+            }
+            int generation = mStreamConfigGenerations.get(deviceId, 0);
+            if (generation != streamConfig.getGeneration()) {
+                return ERROR_STALE_CONFIG;
+            }
+            if (nativeRemoveStream(mPtr, deviceId, streamConfig.getStreamId()) == 0) {
+                return SUCCESS;
+            } else {
+                return ERROR_UNKNOWN;
+            }
         }
     }
 
-    public synchronized void close() {
-        if (mPtr != 0l) {
-            nativeClose(mPtr);
+    public void close() {
+        synchronized (mLock) {
+            if (mPtr != 0l) {
+                nativeClose(mPtr);
+            }
         }
     }
 
-    private synchronized void retrieveStreamConfigs(int deviceId) {
-        ++mStreamConfigGeneration;
-        mStreamConfigs = nativeGetStreamConfigs(mPtr, deviceId, mStreamConfigGeneration);
+    private void retrieveStreamConfigsLocked(int deviceId) {
+        int generation = mStreamConfigGenerations.get(deviceId, 0) + 1;
+        mStreamConfigs.put(deviceId, nativeGetStreamConfigs(mPtr, deviceId, generation));
+        mStreamConfigGenerations.put(deviceId, generation);
     }
 
     // Called from native
@@ -145,12 +159,16 @@ final class TvInputHal implements Handler.Callback {
     public boolean handleMessage(Message msg) {
         switch (msg.what) {
             case EVENT_DEVICE_AVAILABLE: {
+                TvStreamConfig[] configs;
                 TvInputHardwareInfo info = (TvInputHardwareInfo)msg.obj;
-                retrieveStreamConfigs(info.getDeviceId());
-                if (DEBUG) {
-                    Slog.d(TAG, "EVENT_DEVICE_AVAILABLE: info = " + info);
+                synchronized (mLock) {
+                    retrieveStreamConfigsLocked(info.getDeviceId());
+                    if (DEBUG) {
+                        Slog.d(TAG, "EVENT_DEVICE_AVAILABLE: info = " + info);
+                    }
+                    configs = mStreamConfigs.get(info.getDeviceId());
                 }
-                mCallback.onDeviceAvailable(info, mStreamConfigs);
+                mCallback.onDeviceAvailable(info, configs);
                 break;
             }
 
@@ -164,12 +182,16 @@ final class TvInputHal implements Handler.Callback {
             }
 
             case EVENT_STREAM_CONFIGURATION_CHANGED: {
+                TvStreamConfig[] configs;
                 int deviceId = msg.arg1;
-                if (DEBUG) {
-                    Slog.d(TAG, "EVENT_STREAM_CONFIGURATION_CHANGED: deviceId = " + deviceId);
+                synchronized (mLock) {
+                    if (DEBUG) {
+                        Slog.d(TAG, "EVENT_STREAM_CONFIGURATION_CHANGED: deviceId = " + deviceId);
+                    }
+                    retrieveStreamConfigsLocked(deviceId);
+                    configs = mStreamConfigs.get(deviceId);
                 }
-                retrieveStreamConfigs(deviceId);
-                mCallback.onStreamConfigurationChanged(deviceId, mStreamConfigs);
+                mCallback.onStreamConfigurationChanged(deviceId, configs);
                 break;
             }
 

diff --git a/services/core/jni/com_android_server_tv_TvInputHal.cpp b/services/core/jni/com_android_server_tv_TvInputHal.cpp
index 41976ff..5eb627b 100644 (file)
--- a/services/core/jni/com_android_server_tv_TvInputHal.cpp
+++ b/services/core/jni/com_android_server_tv_TvInputHal.cpp
@@ -351,6 +351,8 @@ int JTvInputHal::addStream(int deviceId, int streamId, const sp<Surface>& surfac
             ALOGE("Cannot find a config with given stream ID: %d", streamId);
             return BAD_VALUE;
         }
+        connection.mStreamType = configs[configIndex].type;
+
         tv_stream_t stream;
         stream.stream_id = configs[configIndex].stream_id;
         if (connection.mStreamType == TV_STREAM_TYPE_BUFFER_PRODUCER) {