Upstream version 8.36.161.0

[platform/framework/web/crosswalk.git] / src / xwalk / runtime / android / core_internal / src / org / xwalk / core / internal / extension / api / device_capabilities / XWalkMediaCodec.java

diff --git a/src/xwalk/runtime/android/core/src/org/xwalk/core/extension/api/device_capabilities/XWalkMediaCodec.java b/src/xwalk/runtime/android/core_internal/src/org/xwalk/core/internal/extension/api/device_capabilities/XWalkMediaCodec.java
similarity index 85%
rename from src/xwalk/runtime/android/core/src/org/xwalk/core/extension/api/device_capabilities/XWalkMediaCodec.java
rename to src/xwalk/runtime/android/core_internal/src/org/xwalk/core/internal/extension/api/device_capabilities/XWalkMediaCodec.java
index 739c609..07e05c7 100644 (file)
--- a/src/xwalk/runtime/android/core/src/org/xwalk/core/extension/api/device_capabilities/XWalkMediaCodec.java
+++ b/src/xwalk/runtime/android/core_internal/src/org/xwalk/core/internal/extension/api/device_capabilities/XWalkMediaCodec.java
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.xwalk.core.extension.api.device_capabilities;
+package org.xwalk.core.internal.extension.api.device_capabilities;
 
 import java.util.Set;
 
@@ -31,7 +31,6 @@ abstract class XWalkMediaCodec {
     protected Set<VideoCodecElement> mVideoCodecsSet;
 
     protected DeviceCapabilities mDeviceCapabilities;
-    private static XWalkMediaCodec sInstance;
 
     protected class AudioCodecElement {
         public String codecName;
@@ -75,15 +74,14 @@ abstract class XWalkMediaCodec {
         }
     }
 
-    public static XWalkMediaCodec getInstance(DeviceCapabilities instance) {
-        if (sInstance == null) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-                sInstance = new MediaCodec(instance);
-            } else {
-                sInstance = new MediaCodecNull(instance);
-            }
+    public static XWalkMediaCodec Create(DeviceCapabilities instance) {
+        XWalkMediaCodec codec;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+            codec = new MediaCodec(instance);
+        } else {
+            codec = new MediaCodecNull(instance);
         }
-        return sInstance;
+        return codec;
     }
 
     public abstract JSONObject getCodecsInfo();