Libraries update

.gitignore

@@ -6,6 +6,8 @@
 .classpath
 build/
 dist/
+depends/ffmpeg/
 *.iml
 local.properties
 google-services.json
+TODO

build.gradle

@@ -1,20 +1,20 @@
 ext {
     def abi = project.properties['ABI']
-    VERSION_CODE = 74
-    VERSION_NAME = "1.7.1"
+    VERSION_CODE = 76
+    VERSION_NAME = "1.7.2"
     SDK_MIN_VERSION = 23
     SDK_TARGET_VERSION = 29
     SDK_COMPILE_VERSION = 29
     BUILD_TOOLS_VERSION = "29.0.2"
-    ABI_FILTERS = (abi != null) ? abi.split(",") : ['arm64-v8a', 'armeabi-v7a', 'x86']
+    ABI_FILTERS = (abi != null) ? abi.split(",") : ['arm64-v8a', 'armeabi-v7a', 'x86', 'x86_64']
     localProps = gradle.ext.localProps
 
-    ANDROID_MATERIAL_VERSION = '1.2.0-beta01'
-    ANDROID_PLAY_CORE_VERSION = '1.7.3'
-    ANDROIDX_CORE_VERSION = '1.3.0'
-    ANDROIDX_MEDIA_VERSION = '1.1.0'
-    ANDROIDX_APPCOMPAT_VERSION = '1.2.0-rc01'
-    ANDROIDX_CONSTRAINTLAYOUT_VERSION = '2.0.0-beta7'
+    ANDROID_MATERIAL_VERSION = '1.2.1'
+    ANDROID_PLAY_CORE_VERSION = '1.9.0'
+    ANDROIDX_CORE_VERSION = '1.3.2'
+    ANDROIDX_MEDIA_VERSION = '1.2.0'
+    ANDROIDX_APPCOMPAT_VERSION = '1.2.0'
+    ANDROIDX_CONSTRAINTLAYOUT_VERSION = '2.0.4'
 }
 
 buildscript {
@@ -25,8 +25,8 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.0'
-        classpath 'com.google.gms:google-services:4.3.3'
+        classpath 'com.android.tools.build:gradle:4.1.1'
+        classpath 'com.google.gms:google-services:4.3.4'
     }
 }
 
@@ -93,8 +93,8 @@ subprojects {
 
     dependencies {
         testImplementation 'junit:junit:4.12'
-        androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-        androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+        androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+        androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
     }
 }
 

depends/build.sh

@@ -9,6 +9,7 @@ if [ ! -d "$NDK_DIR" ];then
 fi
 
 DEPENDS_DIR="$(cd "$(dirname "$0")" && pwd)"
+FFMPEG_DIR="$DEPENDS_DIR/ffmpeg"
 EXO_DIR="$DEPENDS_DIR/ExoPlayer"
 EXO_EXT_DIR="$EXO_DIR/extensions"
 
@@ -19,7 +20,15 @@ ANDROIDX_MEDIA_VERSION="$(grep 'ANDROIDX_MEDIA_VERSION = ' $DEPENDS_DIR/../build
 ANDROIDX_APPCOMPAT_VERSION="$(grep 'ANDROIDX_APPCOMPAT_VERSION = ' $DEPENDS_DIR/../build.gradle | cut -d= -f2)"
 
 : ${HOST_PLATFORM:='linux-x86_64'}
-: ${ABI:='armeabi-v7a arm64-v8a x86'}
+: ${ABI:='armeabi-v7a arm64-v8a x86 x86_64'}
+
+# Clone or update FFmpeg
+if [ -d "$FFMPEG_DIR" ]; then
+    cd "$FFMPEG_DIR"
+    git clean -xfd && git reset --hard && git pull
+else
+    git clone 'git://source.ffmpeg.org/ffmpeg' "$FFMPEG_DIR"
+fi
 
 # Clone or update ExoPlayer
 if [ -d "$EXO_DIR" ]; then
@@ -40,16 +49,13 @@ sed -i "s/androidxAppCompatVersion .*/androidxAppCompatVersion = $ANDROIDX_APPCO
 sed -i "s/minSdkVersion .*/minSdkVersion $SDK_MIN_VERSION/" "$EXO_DIR/extensions/gvr/build.gradle"
 sed -i "s/minSdkVersion .*/minSdkVersion $SDK_MIN_VERSION/" "$EXO_DIR/extensions/leanback/build.gradle"
 
-
 # Build ExoPlayer FFmpeg extension
 FFMPEG_DECODERS=(vorbis alac mp3 aac ac3 eac3 mlp truehd)
 
 cd "$EXO_EXT_DIR/ffmpeg/src/main/jni"
-[ -d ffmpeg ] && cd ffmpeg && git clean -xfd && git reset --hard && cd -
-
-./build_ffmpeg.sh "$(pwd)" "$NDK_DIR" "$HOST_PLATFORM" "${FFMPEG_DECODERS[@]}"
-"$NDK_DIR/ndk-build" APP_ABI="$ABI" -j4
+ln -s "$FFMPEG_DIR" ffmpeg
 
+./build_ffmpeg.sh "$(pwd)/.." "$NDK_DIR" "$HOST_PLATFORM" "${FFMPEG_DECODERS[@]}"
 
 # Build ExoPlayer Flac extension
 FLAC_VERSION='1.3.3'

fermata/src/main/java/me/aap/fermata/media/service/FermataMediaService.java

@@ -305,7 +305,7 @@ public void notificationInit() {
 		actionFavRm = new Action(R.drawable.favorite_filled, getString(R.string.favorites_remove),
 				pi(INTENT_FAVORITE_REMOVE));
 
-		notifStyle = new MediaStyle().setShowActionsInCompactView(2).setShowCancelButton(true)
+		notifStyle = new MediaStyle().setShowActionsInCompactView(0, 2, 5).setShowCancelButton(true)
 				.setCancelButtonIntent(MediaButtonReceiver.buildMediaButtonPendingIntent(this,
 						PlaybackStateCompat.ACTION_STOP))
 				.setMediaSession(session.getSessionToken());

fermata/src/main/java/me/aap/fermata/media/service/FermataServiceUiBinder.java

@@ -305,7 +305,7 @@ public void onServiceConnected(ComponentName name, IBinder service) {
 			resultHandler = null;
 			rh.accept(this, null);
 			callback.onPlaybackStateChanged(mediaController.getPlaybackState());
-		} catch (RemoteException ex) {
+		} catch (Exception ex) {
 			rh.accept(null, ex);
 		}
 	}

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Jan 22 22:31:45 MSK 2020
+#Sun Nov 15 22:50:51 MSK 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip

modules/vlc/build.gradle

@@ -14,5 +14,5 @@ dependencies {
     implementation project(':fermata')
     implementation 'androidx.core:core:' + ANDROIDX_CORE_VERSION
     implementation 'androidx.appcompat:appcompat:' + ANDROIDX_APPCOMPAT_VERSION
-    implementation 'org.videolan.android:libvlc-all:3.3.0-eap14'
+    implementation 'org.videolan.android:libvlc-all:3.3.9'
 }