Merge branch 'dev' into localisation
This commit is contained in:
commit
5680b7c477
3 changed files with 17 additions and 3 deletions
|
@ -18,7 +18,7 @@ import android.webkit.WebViewClient;
|
|||
|
||||
import org.schabi.newpipe.util.ThemeHelper;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import androidx.annotation.NonNull;
|
||||
|
||||
/*
|
||||
* Created by beneth <bmauduit@beneth.fr> on 06.12.16.
|
||||
|
@ -147,7 +147,7 @@ public class ReCaptchaActivity extends AppCompatActivity {
|
|||
// add other methods to extract cookies here
|
||||
}
|
||||
|
||||
private void addYoutubeCookies(@Nonnull String cookies) {
|
||||
private void addYoutubeCookies(@NonNull String cookies) {
|
||||
if (cookies.contains("s_gl=") || cookies.contains("goojf=") || cookies.contains("VISITOR_INFO1_LIVE=")) {
|
||||
// youtube seems to also need the other cookies:
|
||||
addCookie(cookies);
|
||||
|
|
|
@ -909,6 +909,18 @@ public final class MainVideoPlayer extends AppCompatActivity
|
|||
final float currentVolumeNormalized = (float) getAudioReactor().getVolume() / getAudioReactor().getMaxVolume();
|
||||
volumeProgressBar.setProgress((int) (volumeProgressBar.getMax() * currentVolumeNormalized));
|
||||
}
|
||||
|
||||
float screenBrightness = getWindow().getAttributes().screenBrightness;
|
||||
if (screenBrightness < 0)
|
||||
screenBrightness = Settings.System.getInt(getContentResolver(),
|
||||
Settings.System.SCREEN_BRIGHTNESS, 0) / 255.0f;
|
||||
|
||||
brightnessProgressBar.setProgress((int) (brightnessProgressBar.getMax() * screenBrightness));
|
||||
|
||||
if (DEBUG) Log.d(TAG, "setInitialGestureValues: volumeProgressBar.getProgress() ["
|
||||
+ volumeProgressBar.getProgress() + "] "
|
||||
+ "brightnessProgressBar.getProgress() ["
|
||||
+ brightnessProgressBar.getProgress() + "]");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -291,8 +291,10 @@ public class Mp4FromDashWriter {
|
|||
sampleCount[i] = 1;// the index is not base zero
|
||||
sampleExtra[i] = -1;
|
||||
}
|
||||
if (tablesInfo[i].sbgp > 0) {
|
||||
writeEntryArray(tablesInfo[i].sbgp, 1, sampleCount[i]);
|
||||
}
|
||||
}
|
||||
|
||||
if (auxBuffer == null) {
|
||||
outRestore();
|
||||
|
|
Loading…
Reference in a new issue