ALL-3936/Assert support DRM

core/src/main/java/com/novoda/noplayer/Heart.java

@@ -1,7 +1,6 @@
 package com.novoda.noplayer;
 
 import android.os.Handler;
-import android.os.Looper;
 
 public class Heart {
 
@@ -14,12 +13,11 @@ public class Heart {
 
     private boolean beating;
 
-    public static Heart newInstance() {
-        Handler handler = new Handler(Looper.getMainLooper());
+    public static Heart newInstance(Handler handler) {
         return new Heart(handler, HEART_BEAT_FREQUENCY_IN_MILLIS);
     }
 
-    Heart(Handler handler, long heartbeatFrequencyInMillis) {
+    private Heart(Handler handler, long heartbeatFrequencyInMillis) {
         this.handler = handler;
         this.heartbeatFrequency = heartbeatFrequencyInMillis;
     }

core/src/main/java/com/novoda/noplayer/drm/DownloadDrmSessionCreator.java

@@ -1,5 +1,7 @@
 package com.novoda.noplayer.drm;
 
+import android.os.Handler;
+
 import com.google.android.exoplayer2.drm.DefaultDrmSessionManager;
 import com.google.android.exoplayer2.drm.DrmSessionManager;
 import com.google.android.exoplayer2.drm.FrameworkMediaCrypto;
@@ -8,14 +10,22 @@ class DownloadDrmSessionCreator implements DrmSessionCreator {
 
     private final DownloadedModularDrm downloadedModularDrm;
     private final FrameworkMediaDrmCreator mediaDrmCreator;
+    private final Handler handler;
 
-    DownloadDrmSessionCreator(DownloadedModularDrm downloadedModularDrm, FrameworkMediaDrmCreator mediaDrmCreator) {
+    DownloadDrmSessionCreator(DownloadedModularDrm downloadedModularDrm, FrameworkMediaDrmCreator mediaDrmCreator, Handler handler) {
         this.downloadedModularDrm = downloadedModularDrm;
         this.mediaDrmCreator = mediaDrmCreator;
+        this.handler = handler;
     }
 
     @Override
     public DrmSessionManager<FrameworkMediaCrypto> create(DefaultDrmSessionManager.EventListener eventListener) {
-        return LocalDrmSessionManager.newInstance(downloadedModularDrm.getKeySetId(), mediaDrmCreator.create(WIDEVINE_MODULAR_UUID), WIDEVINE_MODULAR_UUID, eventListener);
+        return new LocalDrmSessionManager(
+                downloadedModularDrm.getKeySetId(),
+                mediaDrmCreator.create(WIDEVINE_MODULAR_UUID),
+                WIDEVINE_MODULAR_UUID,
+                handler,
+                eventListener
+        );
     }
 }

core/src/main/java/com/novoda/noplayer/drm/DrmSessionCreatorFactory.java

@@ -1,27 +1,66 @@
 package com.novoda.noplayer.drm;
 
+import android.os.Build;
+import android.os.Handler;
+
+import com.novoda.noplayer.drm.provision.HttpPoster;
 import com.novoda.noplayer.drm.provision.ProvisionExecutor;
+import com.novoda.noplayer.drm.provision.ProvisioningCapabilities;
 import com.novoda.noplayer.player.PlayerFactory;
+import com.novoda.utils.AndroidDeviceVersion;
 
 public class DrmSessionCreatorFactory {
 
+    private final AndroidDeviceVersion androidDeviceVersion;
+    private final Handler handler;
+
+    public DrmSessionCreatorFactory(AndroidDeviceVersion androidDeviceVersion, Handler handler) {
+        this.androidDeviceVersion = androidDeviceVersion;
+        this.handler = handler;
+    }
+
     public DrmSessionCreator createFor(DrmType drmType, DrmHandler drmHandler) {
         switch (drmType) {
             case NONE:
                 // Fall-through.
             case WIDEVINE_CLASSIC:
                 return new NoDrmSessionCreator();
             case WIDEVINE_MODULAR_STREAM:
-                ProvisionExecutor provisionExecutor = ProvisionExecutor.newInstance();
-                ProvisioningModularDrmCallback mediaDrmCallback = new ProvisioningModularDrmCallback(
-                        (StreamingModularDrm) drmHandler,
-                        provisionExecutor
-                );
-                return StreamingDrmSessionCreator.newInstance(mediaDrmCallback, new FrameworkMediaDrmCreator());
+                assertThatApiLevelIsJellyBeanEighteenOrAbove(drmType);
+                return createModularStream((StreamingModularDrm) drmHandler);
             case WIDEVINE_MODULAR_DOWNLOAD:
-                return new DownloadDrmSessionCreator((DownloadedModularDrm) drmHandler, new FrameworkMediaDrmCreator());
+                assertThatApiLevelIsJellyBeanEighteenOrAbove(drmType);
+                return createModularDownload((DownloadedModularDrm) drmHandler);
             default:
                 throw PlayerFactory.UnableToCreatePlayerException.noDrmHandlerFor(drmType);
         }
     }
+
+    private void assertThatApiLevelIsJellyBeanEighteenOrAbove(DrmType drmType) {
+        if (androidDeviceVersion.isJellyBeanEighteenOrAbove()) {
+            return;
+        }
+        throw PlayerFactory.UnableToCreatePlayerException.deviceDoesNotMeetTargetApiException(
+                drmType,
+                Build.VERSION_CODES.JELLY_BEAN_MR2,
+                androidDeviceVersion
+        );
+    }
+
+    private DrmSessionCreator createModularStream(StreamingModularDrm drmHandler) {
+        HttpPoster httpPoster = new HttpPoster();
+        ProvisioningCapabilities capabilities = ProvisioningCapabilities.newInstance();
+        ProvisionExecutor provisionExecutor = new ProvisionExecutor(httpPoster, capabilities);
+        ProvisioningModularDrmCallback mediaDrmCallback = new ProvisioningModularDrmCallback(
+                drmHandler,
+                provisionExecutor
+        );
+        FrameworkMediaDrmCreator mediaDrmCreator = new FrameworkMediaDrmCreator();
+        return new StreamingDrmSessionCreator(mediaDrmCallback, mediaDrmCreator, handler);
+    }
+
+    private DownloadDrmSessionCreator createModularDownload(DownloadedModularDrm drmHandler) {
+        FrameworkMediaDrmCreator mediaDrmCreator = new FrameworkMediaDrmCreator();
+        return new DownloadDrmSessionCreator(drmHandler, mediaDrmCreator, handler);
+    }
 }

core/src/main/java/com/novoda/noplayer/drm/LocalDrmSessionManager.java

@@ -25,19 +25,11 @@ class LocalDrmSessionManager implements DrmSessionManager<FrameworkMediaCrypto>
     private final UUID drmScheme;
     private final Handler handler;
 
-    static LocalDrmSessionManager newInstance(KeySetId keySetIdToRestore,
-                                              ExoMediaDrm<FrameworkMediaCrypto> mediaDrm,
-                                              UUID drmScheme,
-                                              DefaultDrmSessionManager.EventListener eventListener) {
-        Handler handler = new Handler(Looper.getMainLooper());
-        return new LocalDrmSessionManager(keySetIdToRestore, mediaDrm, drmScheme, handler, eventListener);
-    }
-
-    private LocalDrmSessionManager(KeySetId keySetIdToRestore,
-                                   ExoMediaDrm<FrameworkMediaCrypto> mediaDrm,
-                                   UUID drmScheme,
-                                   Handler handler,
-                                   DefaultDrmSessionManager.EventListener eventListener) {
+    LocalDrmSessionManager(KeySetId keySetIdToRestore,
+                           ExoMediaDrm<FrameworkMediaCrypto> mediaDrm,
+                           UUID drmScheme,
+                           Handler handler,
+                           DefaultDrmSessionManager.EventListener eventListener) {
         this.keySetIdToRestore = keySetIdToRestore;
         this.mediaDrm = mediaDrm;
         this.eventListener = eventListener;

core/src/main/java/com/novoda/noplayer/drm/StreamingDrmSessionCreator.java

@@ -1,7 +1,6 @@
 package com.novoda.noplayer.drm;
 
 import android.os.Handler;
-import android.os.Looper;
 
 import com.google.android.exoplayer2.drm.DefaultDrmSessionManager;
 import com.google.android.exoplayer2.drm.DrmSessionManager;
@@ -19,12 +18,7 @@ class StreamingDrmSessionCreator implements DrmSessionCreator {
     private final FrameworkMediaDrmCreator frameworkMediaDrmCreator;
     private final Handler handler;
 
-    static StreamingDrmSessionCreator newInstance(MediaDrmCallback mediaDrmCallback, FrameworkMediaDrmCreator frameworkMediaDrmCreator) {
-        Handler handler = new Handler(Looper.getMainLooper());
-        return new StreamingDrmSessionCreator(mediaDrmCallback, frameworkMediaDrmCreator, handler);
-    }
-
-    private StreamingDrmSessionCreator(MediaDrmCallback mediaDrmCallback, FrameworkMediaDrmCreator frameworkMediaDrmCreator, Handler handler) {
+    StreamingDrmSessionCreator(MediaDrmCallback mediaDrmCallback, FrameworkMediaDrmCreator frameworkMediaDrmCreator, Handler handler) {
         this.mediaDrmCallback = mediaDrmCallback;
         this.frameworkMediaDrmCreator = frameworkMediaDrmCreator;
         this.handler = handler;

core/src/main/java/com/novoda/noplayer/drm/provision/HttpPoster.java

@@ -6,7 +6,7 @@
 import java.net.HttpURLConnection;
 import java.net.URL;
 
-class HttpPoster {
+public class HttpPoster {
 
     private static final String POST_REQUEST_METHOD = "POST";
     private static final int RESPONSE_BUFFER_SIZE = 1024 * 4;

core/src/main/java/com/novoda/noplayer/drm/provision/ProvisionExecutor.java

@@ -12,13 +12,7 @@ public class ProvisionExecutor {
     private final HttpPoster httpPoster;
     private final ProvisioningCapabilities capabilities;
 
-    public static ProvisionExecutor newInstance() {
-        HttpPoster httpPoster = new HttpPoster();
-        ProvisioningCapabilities capabilities = ProvisioningCapabilities.newInstance();
-        return new ProvisionExecutor(httpPoster, capabilities);
-    }
-
-    ProvisionExecutor(HttpPoster httpPoster, ProvisioningCapabilities capabilities) {
+    public ProvisionExecutor(HttpPoster httpPoster, ProvisioningCapabilities capabilities) {
         this.httpPoster = httpPoster;
         this.capabilities = capabilities;
     }

core/src/main/java/com/novoda/noplayer/drm/provision/ProvisioningCapabilities.java

@@ -2,19 +2,19 @@
 
 import android.os.Build;
 
-class ProvisioningCapabilities {
+public class ProvisioningCapabilities {
 
     private final int deviceOsVersion;
 
     public static ProvisioningCapabilities newInstance() {
         return new ProvisioningCapabilities(Build.VERSION.SDK_INT);
     }
 
-    ProvisioningCapabilities(int deviceOsVersion) {
+    private ProvisioningCapabilities(int deviceOsVersion) {
         this.deviceOsVersion = deviceOsVersion;
     }
 
-    public boolean canProvision() {
+    boolean canProvision() {
         return deviceOsVersion >= Build.VERSION_CODES.JELLY_BEAN_MR2;
     }
 }

core/src/main/java/com/novoda/noplayer/exoplayer/NoPlayerExoPlayerCreator.java

@@ -0,0 +1,88 @@
+package com.novoda.noplayer.exoplayer;
+
+import android.content.Context;
+import android.os.Handler;
+
+import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
+import com.google.android.exoplayer2.trackselection.FixedTrackSelection;
+import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;
+import com.novoda.noplayer.Heart;
+import com.novoda.noplayer.LoadTimeout;
+import com.novoda.noplayer.Player;
+import com.novoda.noplayer.PlayerListenersHolder;
+import com.novoda.noplayer.SystemClock;
+import com.novoda.noplayer.drm.DrmSessionCreator;
+import com.novoda.noplayer.exoplayer.forwarder.ExoPlayerForwarder;
+import com.novoda.noplayer.exoplayer.mediasource.ExoPlayerAudioTrackSelector;
+import com.novoda.noplayer.exoplayer.mediasource.ExoPlayerSubtitleTrackSelector;
+import com.novoda.noplayer.exoplayer.mediasource.ExoPlayerTrackSelector;
+import com.novoda.noplayer.exoplayer.mediasource.MediaSourceFactory;
+
+public class NoPlayerExoPlayerCreator {
+
+    private final InternalCreator internalCreator;
+
+    public static NoPlayerExoPlayerCreator newInstance(Handler handler) {
+        InternalCreator internalCreator = new InternalCreator(handler);
+        return new NoPlayerExoPlayerCreator(internalCreator);
+    }
+
+    NoPlayerExoPlayerCreator(InternalCreator internalCreator) {
+        this.internalCreator = internalCreator;
+    }
+
+    public Player createExoPlayer(Context context, DrmSessionCreator drmSessionCreator, boolean downgradeSecureDecoder) {
+        ExoPlayerTwoImpl player = internalCreator.create(context, drmSessionCreator, downgradeSecureDecoder);
+        player.initialise();
+        return player;
+    }
+
+    static class InternalCreator {
+
+        private final Handler handler;
+
+        InternalCreator(Handler handler) {
+            this.handler = handler;
+        }
+
+        ExoPlayerTwoImpl create(Context context, DrmSessionCreator drmSessionCreator, boolean downgradeSecureDecoder) {
+            DefaultDataSourceFactory defaultDataSourceFactory = new DefaultDataSourceFactory(context, "user-agent");
+            MediaSourceFactory mediaSourceFactory = new MediaSourceFactory(defaultDataSourceFactory, handler);
+
+            DefaultTrackSelector trackSelector = new DefaultTrackSelector();
+
+            ExoPlayerTrackSelector exoPlayerTrackSelector = ExoPlayerTrackSelector.newInstance(trackSelector);
+            FixedTrackSelection.Factory trackSelectionFactory = new FixedTrackSelection.Factory();
+            ExoPlayerAudioTrackSelector exoPlayerAudioTrackSelector = new ExoPlayerAudioTrackSelector(exoPlayerTrackSelector, trackSelectionFactory);
+            ExoPlayerSubtitleTrackSelector exoPlayerSubtitleTrackSelector = new ExoPlayerSubtitleTrackSelector(
+                    exoPlayerTrackSelector,
+                    trackSelectionFactory
+            );
+
+            ExoPlayerCreator exoPlayerCreator = new ExoPlayerCreator(context, trackSelector);
+            RendererTypeRequesterCreator rendererTypeRequesterCreator = new RendererTypeRequesterCreator();
+            ExoPlayerFacade exoPlayerFacade = new ExoPlayerFacade(
+                    mediaSourceFactory,
+                    exoPlayerAudioTrackSelector,
+                    exoPlayerSubtitleTrackSelector,
+                    exoPlayerCreator,
+                    rendererTypeRequesterCreator
+            );
+
+            PlayerListenersHolder listenersHolder = new PlayerListenersHolder();
+            ExoPlayerForwarder exoPlayerForwarder = new ExoPlayerForwarder();
+            LoadTimeout loadTimeout = new LoadTimeout(new SystemClock(), handler);
+            Heart heart = Heart.newInstance(handler);
+
+            return new ExoPlayerTwoImpl(
+                    exoPlayerFacade,
+                    listenersHolder,
+                    exoPlayerForwarder,
+                    loadTimeout,
+                    heart,
+                    drmSessionCreator,
+                    downgradeSecureDecoder
+            );
+        }
+    }
+}