Merge pull request #21 from SRGSSR/develop

DRM Support

srgmediaplayer/src/main/java/ch/srg/mediaplayer/DrmConfig.java

@@ -0,0 +1,26 @@
+package ch.srg.mediaplayer;
+
+import java.util.UUID;
+
+/**
+ * Copyright (c) SRG SSR. All rights reserved.
+ * <p>
+ * License information is available from the LICENSE file.
+ */
+public class DrmConfig {
+    private String licenceUrl;
+    private UUID drmType;
+
+    public DrmConfig(String licenceUrl, UUID drmType) {
+        this.licenceUrl = licenceUrl;
+        this.drmType = drmType;
+    }
+
+    public String getLicenceUrl() {
+        return licenceUrl;
+    }
+
+    public UUID getDrmType() {
+        return drmType;
+    }
+}

srgmediaplayer/src/main/java/ch/srg/mediaplayer/EventLogger.java

@@ -20,12 +20,12 @@
 import android.util.Log;
 import android.view.Surface;
 
-import com.akamai.android.exoplayer2loader.AkamaiExoPlayerLoader;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.PlaybackParameters;
+import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.RendererCapabilities;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.audio.AudioRendererEventListener;
@@ -59,7 +59,7 @@
 /**
  * Logs player events using {@link Log}.
  */
-/* package */ final class EventLogger implements ExoPlayer.EventListener,
+/* package */ final class EventLogger implements Player.EventListener,
         AudioRendererEventListener, VideoRendererEventListener, AdaptiveMediaSourceEventListener,
         ExtractorMediaSource.EventListener, DefaultDrmSessionManager.EventListener,
         MetadataRenderer.Output {

srgmediaplayer/src/main/java/ch/srg/mediaplayer/SRGDrmMediaPlayerException.java

@@ -0,0 +1,20 @@
+package ch.srg.mediaplayer;
+
+/**
+ * Copyright (c) SRG SSR. All rights reserved.
+ * <p>
+ * License information is available from the LICENSE file.
+ */
+public class SRGDrmMediaPlayerException extends SRGMediaPlayerException {
+    public SRGDrmMediaPlayerException(String detailMessage) {
+        super(detailMessage);
+    }
+
+    public SRGDrmMediaPlayerException(String detailMessage, Throwable throwable) {
+        super(detailMessage, throwable);
+    }
+
+    public SRGDrmMediaPlayerException(Throwable throwable) {
+        super(throwable);
+    }
+}