更新demo 支持加密视频播放

Author: wzyzb

.idea/misc.xml

@@ -16,7 +16,6 @@
 
 import com.tencent.liteav.demo.common.widget.expandableadapter.BaseExpandableRecyclerViewAdapter;
 import com.tencent.liteav.demo.lvb.liveplayer.LivePlayerActivity;
-import com.tencent.liteav.demo.lvb.liveplayer.LivePlayerSurfaceActivity;
 import com.tencent.liteav.demo.player.VodPlayerActivity;
 import com.tencent.liteav.demo.player.superplayer.SuperPlayerActivity;
 import com.tencent.rtmp.TXLiveBase;
@@ -159,7 +158,6 @@ private List<GroupBean> initGroupData() {
 
         // 调试工具
         List<ChildBean> debugChildList = new ArrayList<>();
-        debugChildList.add(new ChildBean("直播播放器 (Surface)", R.drawable.live, LivePlayerActivity.ACTIVITY_TYPE_LIVE_PLAY, LivePlayerSurfaceActivity.class));
         debugChildList.add(new ChildBean("点播播放器", R.drawable.play, LivePlayerActivity.ACTIVITY_TYPE_VOD_PLAY, VodPlayerActivity.class));
 
         if (debugChildList.size() != 0) {

.idea/modules.xml

@@ -398,6 +398,13 @@ private void playVodURL(String url) {
             mVodPlayer.setStartTime(0);
             mVodPlayer.setAutoPlay(true);
             mVodPlayer.setVodListener(this);
+            if(mCurrentProtocol!=null && mCurrentProtocol.getToken()!=null){
+                TXCLog.d(TAG,"TOKEN: "+mCurrentProtocol.getToken());
+                mVodPlayer.setToken(mCurrentProtocol.getToken());
+            }
+            else {
+                mVodPlayer.setToken(null);
+            }
             int ret = mVodPlayer.startPlay(url);
             if (ret == 0) {
                 mCurrentPlayState = SuperPlayerConst.PLAYSTATE_PLAYING;
@@ -1036,7 +1043,8 @@ public void onPlayEvent(TXVodPlayer player, int event, Bundle param) {
                     Collections.sort(bitrateItems); //masterPlaylist多清晰度，按照码率排序，从低到高
                     List<TCVideoQuality> videoQualities = new ArrayList<>();
                     int size = bitrateItems.size();
-                    List<TCResolutionName> resolutionNames = mCurrentProtocol.getResolutionNameList();
+
+                    List<TCResolutionName> resolutionNames = (mCurrentProtocol!=null) ? mCurrentProtocol.getResolutionNameList() : null;
                     for (int i = 0; i < size; i++) {
                         TXBitrateItem bitrateItem = bitrateItems.get(i);
                         TCVideoQuality quality;

app/src/main/java/com/tencent/liteav/demo/MainActivity.java

@@ -6,18 +6,14 @@
  * 自适应码流信息
  */
 
-public class TCAdaptiveStreamingInfo {
-    public int    definition;
-    public String videoPackage;
+public class TCEncryptedStreamingInfo {
     public String drmType;
     public String url;
 
 
     @Override
     public String toString() {
-        return "TCAdaptiveStreamingInfo{" +
-                "definition=" + definition +
-                ", videoPackage='" + videoPackage + '\'' +
+        return "TCEncryptedStreamingInfo{" +
                 ", drmType='" + drmType + '\'' +
                 ", url='" + url + '\'' +
                 '}';

libsuperplayer/src/main/java/com/tencent/liteav/demo/play/SuperPlayerView.java

@@ -4,13 +4,17 @@
  * 自适应码流视频画质别名
  */
 public class TCResolutionName {
-    public int minEdgeLength; // 最小边长px
     public String name;       // 画质名称
+    public int    width;      //
+    public int    height;
+    public String    type;      //类型 可能的取值有 video 和 audio
 
     @Override
     public String toString() {
         return "TCResolutionName{" +
-                "minEdgeLength='" + minEdgeLength + '\'' +
+                "width='" + width + '\'' +
+                "height='" + height + '\'' +
+                "type='" + type + '\'' +
                 ", name=" + name +
                 '}';
     }

…o/play/bean/TCAdaptiveStreamingInfo.java …/play/bean/TCEncryptedStreamingInfo.javalibsuperplayer/src/main/java/com/tencent/liteav/demo/play/bean/TCAdaptiveStreamingInfo.java renamed to libsuperplayer/src/main/java/com/tencent/liteav/demo/play/bean/TCEncryptedStreamingInfo.java libsuperplayer/src/main/java/com/tencent/liteav/demo/play/bean/TCAdaptiveStreamingInfo.java renamed to libsuperplayer/src/main/java/com/tencent/liteav/demo/play/bean/TCEncryptedStreamingInfo.java

@@ -12,12 +12,26 @@
  */
 public interface IPlayInfoParser {
     /**
-     * 获取视频播放url
+     * 获取未加密视频播放url,若没有获取sampleaes url
      *
      * @return url字符串
      */
     String getUrl();
 
+    /**
+     * 获取加密视频播放url
+     *
+     * @return url字符串
+     */
+    String getEncyptedUrl(PlayInfoConstant.EncyptedUrlType type);
+
+    /**
+     * 获取加密token
+     *
+     * @return token字符串
+     */
+    String getToken();
+
     /**
      * 获取视频名称
      *

libsuperplayer/src/main/java/com/tencent/liteav/demo/play/bean/TCResolutionName.java

@@ -30,6 +30,20 @@ public interface IPlayInfoProtocol {
      */
     String getUrl();
 
+    /**
+     * 获取加密视频播放url
+     *
+     * @return url字符串
+     */
+    String getEncyptedUrl(PlayInfoConstant.EncyptedUrlType type);
+
+    /**
+     * 获取加密token
+     *
+     * @return token字符串
+     */
+    String getToken();
+
     /**
      * 获取视频名称
      *

libsuperplayer/src/main/java/com/tencent/liteav/demo/play/protocol/IPlayInfoParser.java

@@ -0,0 +1,20 @@
+package com.tencent.liteav.demo.play.protocol;
+
+public class PlayInfoConstant {
+
+    public enum EncyptedUrlType {
+
+        SIMPLEAES("SimpleAES"),
+        WIDEVINE("widevine");
+
+        EncyptedUrlType(String type){
+            value = type;
+        }
+
+        private  String value;
+
+        public String  getValue(){
+            return value;
+        }
+    }
+}

libsuperplayer/src/main/java/com/tencent/liteav/demo/play/protocol/IPlayInfoProtocol.java

@@ -375,6 +375,16 @@ public String getUrl() {
         return mUrl;
     }
 
+    @Override
+    public String getEncyptedUrl(PlayInfoConstant.EncyptedUrlType type) {
+        return null;
+    }
+
+    @Override
+    public String getToken() {
+        return null;
+    }
+
     /**
      * 获取视频名称
      *