Skip to content

Commit

Permalink
Load predictable subtitle files over network
Browse files Browse the repository at this point in the history
Only .srt for now, but in all possible language variants.

Resolves #173
  • Loading branch information
moneytoo committed Nov 15, 2021
1 parent 98631fe commit 6d24dc6
Show file tree
Hide file tree
Showing 5 changed files with 211 additions and 14 deletions.
1 change: 1 addition & 0 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ dependencies {
implementation 'com.arthenica:ffmpeg-kit-min:4.5.LTS'
implementation 'androidx.appcompat:appcompat:1.3.1'
implementation 'androidx.preference:preference:1.1.1'
implementation 'com.squareup.okhttp3:okhttp:4.9.2'
implementation project(path: ':doubletapplayerview')
implementation project(path: ':android-file-chooser')
implementation fileTree(dir: "libs", include: ["extension-*.aar"])
Expand Down
22 changes: 9 additions & 13 deletions app/src/main/java/com/brouken/player/PlayerActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ public class PlayerActivity extends Activity {

DisplayManager displayManager;
DisplayManager.DisplayListener displayListener;
SubtitleFinder subtitleFinder;


@Override
Expand Down Expand Up @@ -952,19 +953,7 @@ public void onAnimationEnd(Animator animation) {
.setUri(mPrefs.mediaUri)
.setMimeType(mPrefs.mediaType);
if (mPrefs.subtitleUri != null && Utils.fileExists(this, mPrefs.subtitleUri)) {
final String subtitleMime = SubtitleUtils.getSubtitleMime(mPrefs.subtitleUri);
final String subtitleLanguage = SubtitleUtils.getSubtitleLanguage(mPrefs.subtitleUri);
String subtitleName = null;
if (subtitleLanguage == null)
subtitleName = Utils.getFileName(this, mPrefs.subtitleUri);

MediaItem.SubtitleConfiguration subtitle = new MediaItem.SubtitleConfiguration.Builder(mPrefs.subtitleUri)
.setMimeType(subtitleMime)
.setLanguage(subtitleLanguage)
.setSelectionFlags(C.SELECTION_FLAG_DEFAULT)
.setRoleFlags(C.ROLE_FLAG_SUBTITLE)
.setLabel(subtitleName)
.build();
MediaItem.SubtitleConfiguration subtitle = SubtitleUtils.buildSubtitle(this, mPrefs.subtitleUri);
mediaItemBuilder.setSubtitleConfigurations(Collections.singletonList(subtitle));
}
player.setMediaItem(mediaItemBuilder.build(), mPrefs.getPosition());
Expand Down Expand Up @@ -1544,6 +1533,13 @@ void searchSubtitles() {
if (mPrefs.mediaUri == null)
return;

if (Utils.isSupportedNetworkUri(mPrefs.mediaUri) && Utils.isProgressiveContainerUri(mPrefs.mediaUri)) {
SubtitleUtils.clearCache(this);
subtitleFinder = new SubtitleFinder(PlayerActivity.this, mPrefs.mediaUri);
subtitleFinder.start();
return;
}

if (mPrefs.scopeUri != null || isTvBox) {
DocumentFile video = null;
File videoRaw = null;
Expand Down
160 changes: 160 additions & 0 deletions app/src/main/java/com/brouken/player/SubtitleFinder.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,160 @@
package com.brouken.player;

import android.content.res.Resources;
import android.net.Uri;
import android.os.Build;
import android.os.LocaleList;
import android.widget.Toast;

import androidx.annotation.NonNull;

import com.google.android.exoplayer2.MediaItem;
import com.google.android.exoplayer2.util.Util;

import java.io.IOException;
import java.io.InputStream;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.Locale;
import java.util.Map;
import java.util.concurrent.CountDownLatch;

import okhttp3.Call;
import okhttp3.Callback;
import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.Response;

public class SubtitleFinder {

private PlayerActivity activity;
private Uri baseUri;
private String path;
private CountDownLatch countDownLatch;
private Uri subtitleUri;
private final LinkedHashMap<Uri, Boolean> urls;

public SubtitleFinder(PlayerActivity activity, Uri uri) {
this.activity = activity;
path = uri.getPath();
path = path.substring(0, path.lastIndexOf('.'));
baseUri = uri;
urls = new LinkedHashMap<>();
}

private void addLocale(Locale locale) {
final String lang = locale.getISO3Language();
urls.put(buildUri(lang + ".srt"), false);
urls.put(buildUri(Util.normalizeLanguageCode(lang) + ".srt"), false);
}

private Uri buildUri(String suffix) {
final String newPath = path + "." + suffix;
return baseUri.buildUpon().path(newPath).build();
}

public void start() {
new Thread(new Runnable() {
@Override
public void run() {
urls.put(buildUri("srt"), false);

if (Build.VERSION.SDK_INT >= 24) {
final LocaleList localeList = Resources.getSystem().getConfiguration().getLocales();
for (int i = 0; i < localeList.size(); i++) {
addLocale(localeList.get(i));
}
} else {
final Locale locale = Resources.getSystem().getConfiguration().locale;
addLocale(locale);
}

OkHttpClient client = new OkHttpClient.Builder()
//.callTimeout(15, TimeUnit.SECONDS)
.build();

Callback callback = new Callback() {
@Override
public void onFailure(@NonNull Call call, @NonNull IOException e) {
countDownLatch.countDown();
}

@Override
public void onResponse(@NonNull Call call, @NonNull Response response) throws IOException {
Uri url = Uri.parse(response.request().url().toString());
Utils.log(response.code() + ": " + url);
if (response.isSuccessful()) {
synchronized (urls) {
urls.put(url, true);
}
}
response.close();
countDownLatch.countDown();
}
};

for (Uri url : urls.keySet()) {
// Total Commander 3.24 / LAN plugin 3.20 does not support HTTP HEAD
//Request request = new Request.Builder().url(url.toString()).head().build();
Request request = new Request.Builder().url(url.toString()).build();
client.newCall(request).enqueue(callback);
}

countDownLatch = new CountDownLatch(urls.size());

try {
countDownLatch.await();
} catch (InterruptedException e) {
e.printStackTrace();
}

for (Map.Entry<Uri, Boolean> set : urls.entrySet()) {
if (set.getValue()) {
subtitleUri = set.getKey();
break;
}
}

if (subtitleUri == null) {
return;
}

Utils.log(subtitleUri.toString());

// ProtocolException when reusing client:
// java.net.ProtocolException: Unexpected status line: 1
client = new OkHttpClient.Builder()
//.callTimeout(15, TimeUnit.SECONDS)
.build();

Request request = new Request.Builder().url(subtitleUri.toString()).build();
try (Response response = client.newCall(request).execute()) {
InputStream inputStream = response.body().byteStream();
Uri convertedSubtitleUri = SubtitleUtils.convertInputStreamToUTF(activity, subtitleUri, inputStream);

activity.runOnUiThread(new Runnable() {
@Override
public void run() {
activity.mPrefs.updateSubtitle(convertedSubtitleUri);
if (PlayerActivity.player != null) {
MediaItem mediaItem = PlayerActivity.player.getCurrentMediaItem();
if (mediaItem != null) {
MediaItem.SubtitleConfiguration subtitle = SubtitleUtils.buildSubtitle(activity, convertedSubtitleUri);
mediaItem = mediaItem.buildUpon().setSubtitleConfigurations(Collections.singletonList(subtitle)).build();
PlayerActivity.player.setMediaItem(mediaItem, false);
if (BuildConfig.DEBUG) {
Toast.makeText(activity, "Subtitle found", Toast.LENGTH_SHORT).show();
}
}
}
}
});
} catch (IOException e) {
Utils.log(e.toString());
e.printStackTrace();
}
}
}).start();
}

}
31 changes: 30 additions & 1 deletion app/src/main/java/com/brouken/player/SubtitleUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@

import androidx.documentfile.provider.DocumentFile;

import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.MediaItem;
import com.google.android.exoplayer2.util.MimeTypes;
import com.ibm.icu.text.CharsetDetector;
import com.ibm.icu.text.CharsetMatch;
Expand All @@ -14,6 +16,7 @@
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
Expand Down Expand Up @@ -234,9 +237,19 @@ public static void clearCache(Context context) {
}

public static Uri convertToUTF(Context context, Uri subtitleUri) {
try {
InputStream inputStream = context.getContentResolver().openInputStream(subtitleUri);
return convertInputStreamToUTF(context, subtitleUri, inputStream);
} catch (Exception e) {
e.printStackTrace();
}
return subtitleUri;
}

public static Uri convertInputStreamToUTF(Context context, Uri subtitleUri, InputStream inputStream) {
try {
final CharsetDetector detector = new CharsetDetector();
final BufferedInputStream bufferedInputStream = new BufferedInputStream(context.getContentResolver().openInputStream(subtitleUri));
final BufferedInputStream bufferedInputStream = new BufferedInputStream(inputStream);
detector.setText(bufferedInputStream);
final CharsetMatch charsetMatch = detector.detect();

Expand All @@ -256,4 +269,20 @@ public static Uri convertToUTF(Context context, Uri subtitleUri) {
}
return subtitleUri;
}

public static MediaItem.SubtitleConfiguration buildSubtitle(Context context, Uri uri) {
final String subtitleMime = SubtitleUtils.getSubtitleMime(uri);
final String subtitleLanguage = SubtitleUtils.getSubtitleLanguage(uri);
String subtitleName = null;
if (subtitleLanguage == null)
subtitleName = Utils.getFileName(context, uri);

return new MediaItem.SubtitleConfiguration.Builder(uri)
.setMimeType(subtitleMime)
.setLanguage(subtitleLanguage)
.setSelectionFlags(C.SELECTION_FLAG_DEFAULT)
.setRoleFlags(C.ROLE_FLAG_SUBTITLE)
.setLabel(subtitleName)
.build();
}
}
11 changes: 11 additions & 0 deletions app/src/main/java/com/brouken/player/Utils.java
Original file line number Diff line number Diff line change
Expand Up @@ -565,4 +565,15 @@ public static Uri getMoviesFolderUri() {
}
return uri;
}

public static boolean isProgressiveContainerUri(final Uri uri) {
String path = uri.getPath();
if (path == null) {
return false;
}
path = path.toLowerCase();
// FIXME: Have a single list of supported containers - same as from file system?
return (path.endsWith(".3gp") || path.endsWith(".m4v") || path.endsWith(".mkv") || path.endsWith(".mov")
|| path.endsWith(".mp4") || path.endsWith(".webm"));
}
}

0 comments on commit 6d24dc6

Please sign in to comment.