Merge pull request #288 from wseemann/284

Support 16KB page sizes

Author: wseemann

FMMRDemo.apk

@@ -1,10 +1,8 @@
-FFmpegMediaMetadataRetriever
-============================
+# FFmpegMediaMetadataRetriever
 
 View the project page <a href=http://wseemann.github.io/FFmpegMediaMetadataRetriever/>here</a>.
 
-Donations
-------------
+## Donations
 
 Donations can be made via PayPal:
 
@@ -14,82 +12,62 @@ Donations can be made via PayPal:
 
 - [**Choose what you want to donate**](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=2BDTFVEW9LFZY), all donations are awesome!
 
-Overview
---------
+## Overview
 
 FFmpegMediaMetadataRetriever is a reimplementation of Android's MediaMetadataRetriever class. The FFmpegMediaMetadataRetriever class provides a unified interface for retrieving frame and meta data from an input media file and uses FFmpeg as its backend.
 
-This project uses FFmpeg version 4.2.2.
-
 Key Features:
-* ARMv7, x86, x86_64 and ARM_64 support (Note: ARM and MIPS aren't supported as of version 1.0.14)
-* Support for API 16+
-* URL support (Unlike MediaMetadataRetriever, see: http://code.google.com/p/android/issues/detail?id=35794)
+
+- Built using FFmpeg version 7.1.1
+- ARMv7, x86, x86_64 and ARM_64 support (Note: ARM and MIPS aren't supported as of version 1.0.14)
+- Support for API 21+ and 16 KB page sizes
+- URL support (Unlike MediaMetadataRetriever, see: http://code.google.com/p/android/issues/detail?id=35794)
 
 Supported protocols:
-* file, http, https, mms, mmsh and rtmp
+
+- file, http, https, mms, mmsh and rtmp
 
 Supported formats (audio and video):
-* aac, acc+, avi, flac, mp2, mp3, mp4, ogg, 3gp and more!
 
-Additional support for:
-* ICY Metadata (SHOUTcast metadata)
+- aac, acc+, avi, flac, mp2, mp3, mp4, ogg, 3gp and more!
 
-Demo Application
-------------
+Additional support for:
 
-If you would like to try FFmpegMediaMetadataRetriever you can do so using the [Demo Application](https://github.com/wseemann/FFmpegMediaMetadataRetriever/blob/master/FMMRDemo.apk)
+- ICY Metadata (SHOUTcast metadata)
 
-Using FMMR in your application (Android Studio)
-------------
+## Using FMMR in your application (Android Studio)
 
 Add the following maven dependency to your project's `build.gradle` file:
 
     dependencies {
-        implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-core:1.0.19'
-        implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-native:1.0.19'
+        implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-core:1.0.20'
+        implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-native:1.0.20'
     }
 
 Optionally, to support individual ABIs:
 
     dependencies {
-        implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-core:1.0.19'
-        implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-native-armeabi-v7a:1.0.19'
-        implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-native-x86:1.0.19'
-        implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-native-x86_64:1.0.19'
-        implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-native-arm64-v8a:1.0.19'
+        implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-core:1.0.20'
+        implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-native-armeabi-v7a:1.0.20'
+        implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-native-x86:1.0.20'
+        implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-native-x86_64:1.0.20'
+        implementation 'com.github.wseemann:FFmpegMediaMetadataRetriever-native-arm64-v8a:1.0.20'
     }
 
 or, if your application supports individual architectures extract the appropriate AAR file into you projects "libs" folder:
 
 [Prebuilt AARs](https://github.com/wseemann/FFmpegMediaMetadataRetriever/releases/download/v1.0.19/prebuilt-aars.zip)
 
-Demo Application
-------------
+## Demo Application
 
 A sample application that makes use of FFmpegMediaMetadataRetriever can be downloaded [here](https://github.com/wseemann/FFmpegMediaMetadataRetriever/blob/master/FMMRDemo.apk?raw=true). Note: The sample application is compiled with support for ALL available formats. This results in a larger library and APK. FFmpeg can be recompiled with a subset of codecs enabled for those wanting a smaller size.
 
-Installation
-------------
+## Requirements
 
-FFmpegMediaMetadataRetriever relies on FFmpeg and native code. The build process
-is complex and may be confusing for those unfamiliar the Android NDK. For this
-reason I've precompiled AARs created by the build process and checked them
-in [here](https://github.com/wseemann/FFmpegMediaMetadataRetriever/releases/download/v1.0.19/prebuilt-aars.zip).
-The modules are also included with the library. If you don't want to build the modules
-you can simple unzip the prebuilt ones and copy them to your projects "libs" folder. (Note:
-copy them to YOUR projects "libs" folder, NOT the "libs" folder located in
-FFmpegMediaMetadataRetriever/fmmr-library. Once this step is complete you can use the
-library (See: Installation in Eclipse (Kepler)). If you want to compile the modules yourself
-follow the Ant instructions listed below before attempting to use the library.
+- [Android Studio](http://developer.android.com/sdk/index.html) Meerkat 2024.3.2 Patch 1 or higher
+- [Android NDK](http://developer.android.com/tools/sdk/ndk/index.html) r27 or higher
 
-Download and install the [Android SDK](http://developer.android.com/sdk/index.html).
-Download the [Android NDK](http://developer.android.com/tools/sdk/ndk/index.html).
-Clone/Download/Fork the repo through GitHub or via (read-only)
-
-    git clone https://github.com/wseemann/FFmpegMediaMetadataRetriever.git
-
-### Android Studio (Gradle)
+## Android Studio (Gradle)
 
 Note: The build instructions and scripts assume you are running Unix or Linux. Building
 on other operating systems is currently not supported.
@@ -109,12 +87,11 @@ where <path to SDK> is the path to your Android SDK, for example:
 
 where <path to NDK> is the path to your Android NDK, for example:
 
-    ndk.dir=/home/wseemann/Android/android-ndk-r20
+    ndk.dir=/Users/wseemann/Library/Android/sdk/ndk/27.1.12297006
 
 To compile the library in Android Studio, highlight `core` in the project explorer and run Build->Make Module 'core'. This will also build the native FFmpeg binaries.
 
-Usage
-------------
+## Usage
 
 Sample code:
 
@@ -124,21 +101,20 @@ Sample code:
     mmr.extractMetadata(FFmpegMediaMetadataRetriever.METADATA_KEY_ARTIST);
     Bitmap b = mmr.getFrameAtTime(2000000, FFmpegMediaMetadataRetriever.OPTION_CLOSEST); // frame at 2 seconds
     byte [] artwork = mmr.getEmbeddedPicture();
-    
+
     mmr.release();
 
-FFmpeg
------------
+## FFmpeg
+
 This software uses code of <a href=http://ffmpeg.org>FFmpeg</a> licensed under the <a href=http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html>LGPLv2.1</a> and its source can be downloaded <a href=https://www.ffmpeg.org/developer.html>here</a>.
 
-License
-------------
+## License
 
 ```
-FFmpegMediaMetadataRetriever: A unified interface for retrieving frame 
+FFmpegMediaMetadataRetriever: A unified interface for retrieving frame
 and meta data from an input media file.
 
-Copyright 2022 William Seemann
+Copyright 2025 William Seemann
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -151,3 +127,4 @@ distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
+```

README.md

@@ -0,0 +1,6 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+plugins {
+    alias(libs.plugins.android.application) apply false
+    alias(libs.plugins.kotlin.android) apply false
+    alias(libs.plugins.kotlin.compose) apply false
+}

build.gradle

@@ -0,0 +1,113 @@
+#!/bin/bash
+progname="${0##*/}"
+progname="${progname%.sh}"
+
+# usage: check_elf_alignment.sh [path to *.so files|path to *.apk]
+
+cleanup_trap() {
+  if [ -n "${tmp}" -a -d "${tmp}" ]; then
+    rm -rf ${tmp}
+  fi
+  exit $1
+}
+
+usage() {
+  echo "Host side script to check the ELF alignment of shared libraries."
+  echo "Shared libraries are reported ALIGNED when their ELF regions are"
+  echo "16 KB or 64 KB aligned. Otherwise they are reported as UNALIGNED."
+  echo
+  echo "Usage: ${progname} [input-path|input-APK|input-APEX]"
+}
+
+if [ ${#} -ne 1 ]; then
+  usage
+  exit
+fi
+
+case ${1} in
+  --help | -h | -\?)
+    usage
+    exit
+    ;;
+
+  *)
+    dir="${1}"
+    ;;
+esac
+
+if ! [ -f "${dir}" -o -d "${dir}" ]; then
+  echo "Invalid file: ${dir}" >&2
+  exit 1
+fi
+
+if [[ "${dir}" == *.apk ]]; then
+  trap 'cleanup_trap' EXIT
+
+  echo
+  echo "Recursively analyzing $dir"
+  echo
+
+  if { zipalign --help 2>&1 | grep -q "\-P <pagesize_kb>"; }; then
+    echo "=== APK zip-alignment ==="
+    zipalign -v -c -P 16 4 "${dir}" | egrep 'lib/arm64-v8a|lib/x86_64|Verification'
+    echo "========================="
+  else
+    echo "NOTICE: Zip alignment check requires build-tools version 35.0.0-rc3 or higher."
+    echo "  You can install the latest build-tools by running the below command"
+    echo "  and updating your \$PATH:"
+    echo
+    echo "    sdkmanager \"build-tools;35.0.0-rc3\""
+  fi
+
+  dir_filename=$(basename "${dir}")
+  tmp=$(mktemp -d -t "${dir_filename%.apk}_out_XXXXX")
+  unzip "${dir}" lib/* -d "${tmp}" >/dev/null 2>&1
+  dir="${tmp}"
+fi
+
+if [[ "${dir}" == *.apex ]]; then
+  trap 'cleanup_trap' EXIT
+
+  echo
+  echo "Recursively analyzing $dir"
+  echo
+
+  dir_filename=$(basename "${dir}")
+  tmp=$(mktemp -d -t "${dir_filename%.apex}_out_XXXXX")
+  deapexer extract "${dir}" "${tmp}" || { echo "Failed to deapex." && exit 1; }
+  dir="${tmp}"
+fi
+
+RED="\e[31m"
+GREEN="\e[32m"
+ENDCOLOR="\e[0m"
+
+unaligned_libs=()
+
+echo
+echo "=== ELF alignment ==="
+
+matches="$(find "${dir}" -type f)"
+IFS=$'\n'
+for match in $matches; do
+  # We could recursively call this script or rewrite it to though.
+  [[ "${match}" == *".apk" ]] && echo "WARNING: doesn't recursively inspect .apk file: ${match}"
+  [[ "${match}" == *".apex" ]] && echo "WARNING: doesn't recursively inspect .apex file: ${match}"
+
+  [[ $(file "${match}") == *"ELF"* ]] || continue
+
+  res="$(objdump -p "${match}" | grep LOAD | awk '{ print $NF }' | head -1)"
+  if [[ $res =~ 2\*\*(1[4-9]|[2-9][0-9]|[1-9][0-9]{2,}) ]]; then
+    echo -e "${match}: ${GREEN}ALIGNED${ENDCOLOR} ($res)"
+  else
+    echo -e "${match}: ${RED}UNALIGNED${ENDCOLOR} ($res)"
+    unaligned_libs+=("${match}")
+  fi
+done
+
+if [ ${#unaligned_libs[@]} -gt 0 ]; then
+  echo -e "${RED}Found ${#unaligned_libs[@]} unaligned libs (only arm64-v8a/x86_64 libs need to be aligned).${ENDCOLOR}"
+elif [ -n "${dir_filename}" ]; then
+  echo -e "ELF Verification Successful"
+fi
+echo "====================="

build.gradle.kts

@@ -2,13 +2,14 @@ apply plugin: 'com.android.library'
 apply from: "$rootProject.projectDir/publishing.gradle"
 
 android {
-    compileSdk versions.get("compileSdkVersion")
+    namespace 'wseemann.media'
+
+    compileSdk Integer.parseInt(libs.versions.compileSdk.get())
 
     defaultConfig {
-        minSdkVersion versions.get("minSdkVersion")
-        targetSdkVersion versions.get("targetSdkVersion")
-        versionCode versions.get("versionCode")
-        versionName versions.get("versionName")
+        minSdkVersion Integer.parseInt(libs.versions.minSdk.get())
+        targetSdkVersion Integer.parseInt(libs.versions.targetSdk.get())
+        ndkVersion libs.versions.ndk.get()
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -23,6 +24,17 @@ android {
     publishing {
         singleVariant('release')
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+
+    java {
+        toolchain {
+            languageVersion = JavaLanguageVersion.of(17)
+        }
+    }
 }
 
 afterEvaluate {
@@ -33,7 +45,7 @@ afterEvaluate {
 
                 groupId = 'com.github.wseemann'
                 artifactId = 'FFmpegMediaMetadataRetriever-core'
-                version = "$project.android.defaultConfig.versionName"
+                version = libs.versions.versionName.get()
 
                 pom {
                     name = 'FFmpegMediaMetadataRetriever-core'
@@ -65,8 +77,8 @@ afterEvaluate {
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.5.1'
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test:runner:1.4.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    implementation(libs.androidx.appcompat)
+    testImplementation(libs.junit)
+    androidTestImplementation(libs.androidx.runner)
+    androidTestImplementation(libs.androidx.espresso.core)
 }

check_elf_alignment.sh

@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="wseemann.media">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
 

core/build.gradle

@@ -2,7 +2,7 @@
  * FFmpegMediaMetadataRetriever: A unified interface for retrieving frame 
  * and meta data from an input media file.
  *
- * Copyright 2022 William Seemann
+ * Copyright 2025 William Seemann
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.