HLS media source

kristurek · Feb 16, 2023 · 75fd01b · 75fd01b
1 parent e5b131c
commit 75fd01b
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -31,8 +31,8 @@ android {
         applicationId "com.kristurek.polskatv"
         minSdkVersion 22
         targetSdkVersion 28
-        versionCode 117
-        versionName "117"
+        versionCode 118
+        versionName "118"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
         buildConfigField "String", "DROPBOX_TOKEN", "\""+getDropboxToken()+"\""
@@ -102,6 +102,7 @@ dependencies {
 
     implementation 'com.google.android.exoplayer:exoplayer-core:2.16.1'
     implementation 'com.google.android.exoplayer:exoplayer-ui:2.16.1'
+    implementation 'com.google.android.exoplayer:exoplayer-hls:2.16.1'
 
     implementation 'com.google.android.material:material:1.4.0'
 }
diff --git a/app/src/main/java/com/kristurek/polskatv/iptv/polbox/PolboxService.java b/app/src/main/java/com/kristurek/polskatv/iptv/polbox/PolboxService.java
@@ -71,7 +71,7 @@ public LoginResponse login(LoginRequest request) throws IptvException {
 
         persistRequest(request);
 
-        LoginResponse response = process(new LoginConverter(), () -> api.login(request.getLogin(), request.getPass(), "all", "polwin-jo-001", "b9007bc2ca5768442a3fa4c41f14a4fb", "en"));
+        LoginResponse response = process(new LoginConverter(), () -> api.login(request.getLogin(), request.getPass(), "all", "polwin-jo-001", "b9007bc2ca5768442a3fa4c41f14a4fb", "en", "apple"));
 
         if (response.getRestOfDay() == 0)
             throw new IptvSubscriptionExpiredException(ExceptionHelper.SUBSCRIPTION_EXPIRED_MSG);

diff --git a/app/src/main/java/com/kristurek/polskatv/iptv/polbox/endpoint/PolboxApi.java b/app/src/main/java/com/kristurek/polskatv/iptv/polbox/endpoint/PolboxApi.java
@@ -36,7 +36,8 @@ Call<BaseRetrofitResponse> login(@Field("login") String login,
                                      @Field("settings") String settings,
                                      @Field("softid") String softId,
                                      @Field("cli_serial") String cliSerial,
-                                     @Field("lang") String lang);
+                                     @Field("lang") String lang,
+                                     @Field("device") String device);
 
     @TargetClass(clazz = LogoutRetrofitResponse.class)
     @GET("/api/json/logout")

diff --git a/app/src/main/java/com/kristurek/polskatv/ui/player/PlayerViewModel.java b/app/src/main/java/com/kristurek/polskatv/ui/player/PlayerViewModel.java
@@ -14,6 +14,7 @@
 import com.google.android.exoplayer2.SimpleExoPlayer;
 import com.google.android.exoplayer2.source.MediaSource;
 import com.google.android.exoplayer2.source.ProgressiveMediaSource;
+import com.google.android.exoplayer2.source.hls.HlsMediaSource;
 import com.google.android.exoplayer2.trackselection.AdaptiveTrackSelection;
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
 import com.google.android.exoplayer2.trackselection.ExoTrackSelection;
@@ -244,10 +245,14 @@ private void postProcessAfterInitializationUrl(PlayerModel result) {
                     .setConnectTimeoutMs(CONNECT_TIMEOUT)
                     .setReadTimeoutMs(READ_TIMEOUT);
 
-            MediaSource source = new ProgressiveMediaSource.Factory(httpDataSourceFactory).createMediaSource(MediaItem.fromUri(uri));
+            //MediaSource source = new ProgressiveMediaSource.Factory(httpDataSourceFactory).createMediaSource(MediaItem.fromUri(uri));
+
+            HlsMediaSource hlsMediaSource =
+                    new HlsMediaSource.Factory(httpDataSourceFactory)
+                            .createMediaSource(MediaItem.fromUri(uri));
 
             player.postValue(internalPlayer);
-            internalPlayer.setMediaSource(source);
+            internalPlayer.setMediaSource(hlsMediaSource);
             internalPlayer.prepare();
 
             timeline = new PlayerTimeline(result.getEpgCurrentTime());