Android project migration to platforms/android

2025-09-28 04:22:53 +09:00
parent 484e4e0338
commit ce99a6b3d3
58 changed files with 169 additions and 16 deletions
--- a/vav2/platforms/android/CMakeLists.txt
+++ b/vav2/platforms/android/CMakeLists.txt
@@ -10,48 +10,48 @@ endif()

 # Set library directory based on ABI
 if(ANDROID_ABI STREQUAL "arm64-v8a")
-    set(LIB_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libs/arm64-v8a")
+    set(LIB_DIR "${CMAKE_CURRENT_SOURCE_DIR}/vavcore/libs/arm64-v8a")
 elseif(ANDROID_ABI STREQUAL "armeabi-v7a")
-    set(LIB_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libs/armeabi-v7a")
+    set(LIB_DIR "${CMAKE_CURRENT_SOURCE_DIR}/vavcore/libs/armeabi-v7a")
 else()
    message(FATAL_ERROR "Unsupported Android ABI: ${ANDROID_ABI}")
 endif()

 # Include directories
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/vavcore/include)

 # Import dav1d as prebuilt library
 add_library(dav1d SHARED IMPORTED)
 set_target_properties(dav1d PROPERTIES
    IMPORTED_LOCATION ${LIB_DIR}/libdav1d.so
-    INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR}/include
+    INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR}/vavcore/include
 )

 # Also provide static library option
 add_library(dav1d_static STATIC IMPORTED)
 set_target_properties(dav1d_static PROPERTIES
    IMPORTED_LOCATION ${LIB_DIR}/libdav1d.a
-    INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR}/include
+    INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR}/vavcore/include
 )

 # VavCore sources for Android
 set(VAVCORE_ANDROID_SOURCES
    # Common VavCore sources (only .cpp files)
-    ../../VavCore/src/Decoder/VideoDecoderFactory.cpp
-    ../../VavCore/src/Decoder/AV1Decoder.cpp
-    ../../VavCore/src/FileIO/WebMFileReader.cpp
+    vavcore/src/Decoder/VideoDecoderFactory.cpp
+    vavcore/src/Decoder/AV1Decoder.cpp
+    vavcore/src/FileIO/WebMFileReader.cpp

    # Android-specific sources
-    ../../VavCore/src/Decoder/AndroidMediaCodecAV1Decoder.cpp
+    vavcore/src/Decoder/AndroidMediaCodecAV1Decoder.cpp

    # Test/example sources
-    src/android_test.cpp
+    tests/native/android_test.cpp
 )

 # Include directories for VavCore
 include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../VavCore/src
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../VavCore/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/vavcore/src
+    ${CMAKE_CURRENT_SOURCE_DIR}/vavcore/include
 )

 # Add platform-specific preprocessor definitions
--- a/vav2/platforms/android/applications/vav2player/.gitignore
+++ b/vav2/platforms/android/applications/vav2player/.gitignore
@@ -0,0 +1,15 @@
+*.iml
+.gradle
+/local.properties
+/.idea/caches
+/.idea/libraries
+/.idea/modules.xml
+/.idea/workspace.xml
+/.idea/navEditor.xml
+/.idea/assetWizardSettings.xml
+.DS_Store
+/build
+/captures
+.externalNativeBuild
+.cxx
+local.properties
--- a/vav2/platforms/android/applications/vav2player/app/.gitignore
+++ b/vav2/platforms/android/applications/vav2player/app/.gitignore
@@ -0,0 +1 @@
+/build
--- a/vav2/platforms/android/applications/vav2player/app/build.gradle.kts
+++ b/vav2/platforms/android/applications/vav2player/app/build.gradle.kts
@@ -0,0 +1,60 @@
+plugins {
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.kotlin.compose)
+}
+
+android {
+    namespace = "com.ened.vav2player_android"
+    compileSdk = 36
+
+    defaultConfig {
+        applicationId = "com.ened.vav2player_android"
+        minSdk = 29
+        targetSdk = 36
+        versionCode = 1
+        versionName = "1.0"
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = "11"
+    }
+    buildFeatures {
+        compose = true
+    }
+}
+
+dependencies {
+    implementation(project(":vavcore"))
+
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.lifecycle.runtime.ktx)
+    implementation(libs.androidx.activity.compose)
+    implementation(platform(libs.androidx.compose.bom))
+    implementation(libs.androidx.compose.ui)
+    implementation(libs.androidx.compose.ui.graphics)
+    implementation(libs.androidx.compose.ui.tooling.preview)
+    implementation(libs.androidx.compose.material3)
+    testImplementation(libs.junit)
+    androidTestImplementation(libs.androidx.junit)
+    androidTestImplementation(libs.androidx.espresso.core)
+    androidTestImplementation(platform(libs.androidx.compose.bom))
+    androidTestImplementation(libs.androidx.compose.ui.test.junit4)
+    debugImplementation(libs.androidx.compose.ui.tooling)
+    debugImplementation(libs.androidx.compose.ui.test.manifest)
+}
--- a/vav2/platforms/android/applications/vav2player/app/proguard-rules.pro
+++ b/vav2/platforms/android/applications/vav2player/app/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
--- a/vav2/platforms/android/applications/vav2player/app/src/androidTest/java/com/ened/vav2player_android/ExampleInstrumentedTest.kt
+++ b/vav2/platforms/android/applications/vav2player/app/src/androidTest/java/com/ened/vav2player_android/ExampleInstrumentedTest.kt
@@ -0,0 +1,24 @@
+package com.ened.vav2player_android
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("com.ened.vav2player_android", appContext.packageName)
+    }
+}
--- a/vav2/platforms/android/applications/vav2player/app/src/main/AndroidManifest.xml
+++ b/vav2/platforms/android/applications/vav2player/app/src/main/AndroidManifest.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <application
+        android:allowBackup="true"
+        android:dataExtractionRules="@xml/data_extraction_rules"
+        android:fullBackupContent="@xml/backup_rules"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:theme="@style/Theme.Vav2Player_Android">
+        <activity
+            android:name=".MainActivity"
+            android:exported="true"
+            android:label="@string/app_name"
+            android:theme="@style/Theme.Vav2Player_Android">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
--- a/vav2/platforms/android/applications/vav2player/app/src/main/java/com/ened/vav2player_android/MainActivity.kt
+++ b/vav2/platforms/android/applications/vav2player/app/src/main/java/com/ened/vav2player_android/MainActivity.kt
@@ -0,0 +1,179 @@
+package com.ened.vav2player_android
+
+import android.content.Intent
+import android.os.Bundle
+import android.util.Log
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.ened.vav2player_android.ui.theme.Vav2Player_AndroidTheme
+import com.vavcore.VavCore
+
+class MainActivity : ComponentActivity() {
+    private val TAG = "MainActivity"
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        enableEdgeToEdge()
+        setContent {
+            Vav2Player_AndroidTheme {
+                Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding ->
+                    MainScreen(
+                        modifier = Modifier.padding(innerPadding),
+                        onVavCoreTestClick = { startVavCoreTest() },
+                        onMediaCodecTestClick = { startMediaCodecTest() },
+                        onVideoPlayerClick = { startVideoPlayer() },
+                        onPerformanceTestClick = { startPerformanceTest() }
+                    )
+                }
+            }
+        }
+    }
+
+    private fun startVavCoreTest() {
+        // TODO: Implement VavCoreTestActivity
+        Log.i(TAG, "VavCore Test clicked")
+    }
+
+    private fun startMediaCodecTest() {
+        // TODO: Implement MediaCodecTestActivity
+        Log.i(TAG, "MediaCodec Test clicked")
+    }
+
+    private fun startVideoPlayer() {
+        // TODO: Implement VideoPlayerActivity
+        Log.i(TAG, "Video Player clicked")
+    }
+
+    private fun startPerformanceTest() {
+        // TODO: Implement PerformanceTestActivity
+        Log.i(TAG, "Performance Test clicked")
+    }
+}
+
+@Composable
+fun MainScreen(
+    modifier: Modifier = Modifier,
+    onVavCoreTestClick: () -> Unit,
+    onMediaCodecTestClick: () -> Unit,
+    onVideoPlayerClick: () -> Unit,
+    onPerformanceTestClick: () -> Unit
+) {
+    var statusText by remember { mutableStateOf("Initializing...") }
+
+    LaunchedEffect(Unit) {
+        statusText = initializeVavCore()
+    }
+
+    Column(
+        modifier = modifier
+            .fillMaxSize()
+            .padding(16.dp)
+            .verticalScroll(rememberScrollState()),
+        verticalArrangement = Arrangement.spacedBy(16.dp),
+        horizontalAlignment = Alignment.CenterHorizontally
+    ) {
+        Text(
+            text = "Vav2Player Android",
+            style = MaterialTheme.typography.headlineMedium
+        )
+
+        Spacer(modifier = Modifier.height(16.dp))
+
+        // Test Buttons
+        Button(
+            onClick = onVavCoreTestClick,
+            modifier = Modifier.fillMaxWidth()
+        ) {
+            Text("VavCore Test")
+        }
+
+        Button(
+            onClick = onMediaCodecTestClick,
+            modifier = Modifier.fillMaxWidth()
+        ) {
+            Text("MediaCodec Test")
+        }
+
+        Button(
+            onClick = onVideoPlayerClick,
+            modifier = Modifier.fillMaxWidth()
+        ) {
+            Text("Video Player")
+        }
+
+        Button(
+            onClick = onPerformanceTestClick,
+            modifier = Modifier.fillMaxWidth()
+        ) {
+            Text("Performance Test")
+        }
+
+        Spacer(modifier = Modifier.height(24.dp))
+
+        // Status Display
+        Card(
+            modifier = Modifier.fillMaxWidth()
+        ) {
+            Text(
+                text = statusText,
+                modifier = Modifier.padding(16.dp),
+                style = MaterialTheme.typography.bodyMedium
+            )
+        }
+    }
+}
+
+private fun initializeVavCore(): String {
+    return try {
+        val version = VavCore.getVersion()
+        val statusBuilder = StringBuilder("VavCore Version: $version\n")
+
+        val initialized = VavCore.initialize()
+        if (initialized) {
+            statusBuilder.append("✅ VavCore initialized successfully\n")
+
+            // List available decoders
+            val decoders = VavCore.listAvailableDecoders()
+            statusBuilder.append("Available decoders: ${decoders.joinToString(", ")}\n")
+
+            // Test MediaCodec
+            val mediaCodecWorking = VavCore.isMediaCodecAvailable()
+            statusBuilder.append("MediaCodec: ${if (mediaCodecWorking) "✅ Available" else "❌ Not available"}\n")
+
+            // Test dav1d
+            val dav1dWorking = VavCore.isDav1dAvailable()
+            statusBuilder.append("dav1d: ${if (dav1dWorking) "✅ Available" else "❌ Not available"}")
+
+        } else {
+            statusBuilder.append("❌ Failed to initialize VavCore")
+        }
+
+        statusBuilder.toString()
+    } catch (e: Exception) {
+        Log.e("MainActivity", "Error initializing VavCore", e)
+        "❌ VavCore initialization error: ${e.message}"
+    }
+}
+
+@Preview(showBackground = true)
+@Composable
+fun MainScreenPreview() {
+    Vav2Player_AndroidTheme {
+        MainScreen(
+            onVavCoreTestClick = {},
+            onMediaCodecTestClick = {},
+            onVideoPlayerClick = {},
+            onPerformanceTestClick = {}
+        )
+    }
+}
--- a/vav2/platforms/android/applications/vav2player/app/src/main/java/com/ened/vav2player_android/ui/theme/Color.kt
+++ b/vav2/platforms/android/applications/vav2player/app/src/main/java/com/ened/vav2player_android/ui/theme/Color.kt
@@ -0,0 +1,11 @@
+package com.ened.vav2player_android.ui.theme
+
+import androidx.compose.ui.graphics.Color
+
+val Purple80 = Color(0xFFD0BCFF)
+val PurpleGrey80 = Color(0xFFCCC2DC)
+val Pink80 = Color(0xFFEFB8C8)
+
+val Purple40 = Color(0xFF6650a4)
+val PurpleGrey40 = Color(0xFF625b71)
+val Pink40 = Color(0xFF7D5260)
--- a/vav2/platforms/android/applications/vav2player/app/src/main/java/com/ened/vav2player_android/ui/theme/Theme.kt
+++ b/vav2/platforms/android/applications/vav2player/app/src/main/java/com/ened/vav2player_android/ui/theme/Theme.kt
@@ -0,0 +1,58 @@
+package com.ened.vav2player_android.ui.theme
+
+import android.app.Activity
+import android.os.Build
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.darkColorScheme
+import androidx.compose.material3.dynamicDarkColorScheme
+import androidx.compose.material3.dynamicLightColorScheme
+import androidx.compose.material3.lightColorScheme
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.LocalContext
+
+private val DarkColorScheme = darkColorScheme(
+    primary = Purple80,
+    secondary = PurpleGrey80,
+    tertiary = Pink80
+)
+
+private val LightColorScheme = lightColorScheme(
+    primary = Purple40,
+    secondary = PurpleGrey40,
+    tertiary = Pink40
+
+    /* Other default colors to override
+    background = Color(0xFFFFFBFE),
+    surface = Color(0xFFFFFBFE),
+    onPrimary = Color.White,
+    onSecondary = Color.White,
+    onTertiary = Color.White,
+    onBackground = Color(0xFF1C1B1F),
+    onSurface = Color(0xFF1C1B1F),
+    */
+)
+
+@Composable
+fun Vav2Player_AndroidTheme(
+    darkTheme: Boolean = isSystemInDarkTheme(),
+    // Dynamic color is available on Android 12+
+    dynamicColor: Boolean = true,
+    content: @Composable () -> Unit
+) {
+    val colorScheme = when {
+        dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
+            val context = LocalContext.current
+            if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
+        }
+
+        darkTheme -> DarkColorScheme
+        else -> LightColorScheme
+    }
+
+    MaterialTheme(
+        colorScheme = colorScheme,
+        typography = Typography,
+        content = content
+    )
+}
--- a/vav2/platforms/android/applications/vav2player/app/src/main/java/com/ened/vav2player_android/ui/theme/Type.kt
+++ b/vav2/platforms/android/applications/vav2player/app/src/main/java/com/ened/vav2player_android/ui/theme/Type.kt
@@ -0,0 +1,34 @@
+package com.ened.vav2player_android.ui.theme
+
+import androidx.compose.material3.Typography
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.sp
+
+// Set of Material typography styles to start with
+val Typography = Typography(
+    bodyLarge = TextStyle(
+        fontFamily = FontFamily.Default,
+        fontWeight = FontWeight.Normal,
+        fontSize = 16.sp,
+        lineHeight = 24.sp,
+        letterSpacing = 0.5.sp
+    )
+    /* Other default text styles to override
+    titleLarge = TextStyle(
+        fontFamily = FontFamily.Default,
+        fontWeight = FontWeight.Normal,
+        fontSize = 22.sp,
+        lineHeight = 28.sp,
+        letterSpacing = 0.sp
+    ),
+    labelSmall = TextStyle(
+        fontFamily = FontFamily.Default,
+        fontWeight = FontWeight.Medium,
+        fontSize = 11.sp,
+        lineHeight = 16.sp,
+        letterSpacing = 0.5.sp
+    )
+    */
+)
--- a/vav2/platforms/android/applications/vav2player/app/src/main/res/drawable/ic_launcher_background.xml
+++ b/vav2/platforms/android/applications/vav2player/app/src/main/res/drawable/ic_launcher_background.xml
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:fillColor="#3DDC84"
+        android:pathData="M0,0h108v108h-108z" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9,0L9,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,0L19,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,0L29,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,0L39,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,0L49,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,0L59,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,0L69,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,0L79,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M89,0L89,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M99,0L99,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,9L108,9"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,19L108,19"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,29L108,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,39L108,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,49L108,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,59L108,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,69L108,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,79L108,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,89L108,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,99L108,99"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,29L89,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,39L89,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,49L89,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,59L89,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,69L89,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,79L89,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,19L29,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,19L39,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,19L49,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,19L59,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,19L69,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,19L79,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+</vector>
--- a/vav2/platforms/android/applications/vav2player/app/src/main/res/drawable/ic_launcher_foreground.xml
+++ b/vav2/platforms/android/applications/vav2player/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="85.84757"
+                android:endY="92.4963"
+                android:startX="42.9492"
+                android:startY="49.59793"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0" />
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+</vector>
--- a/vav2/platforms/android/applications/vav2player/app/src/main/res/mipmap-anydpi/ic_launcher.xml
+++ b/vav2/platforms/android/applications/vav2player/app/src/main/res/mipmap-anydpi/ic_launcher.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
--- a/vav2/platforms/android/applications/vav2player/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml
+++ b/vav2/platforms/android/applications/vav2player/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
--- a/vav2/platforms/android/applications/vav2player/app/src/main/res/mipmap-hdpi/ic_launcher.webp
+++ b/vav2/platforms/android/applications/vav2player/app/src/main/res/mipmap-hdpi/ic_launcher.webp
--- a/vav2/platforms/android/applications/vav2player/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
+++ b/vav2/platforms/android/applications/vav2player/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
--- a/vav2/platforms/android/applications/vav2player/app/src/main/res/mipmap-mdpi/ic_launcher.webp
+++ b/vav2/platforms/android/applications/vav2player/app/src/main/res/mipmap-mdpi/ic_launcher.webp
--- a/vav2/platforms/android/applications/vav2player/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
+++ b/vav2/platforms/android/applications/vav2player/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
--- a/vav2/platforms/android/applications/vav2player/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
+++ b/vav2/platforms/android/applications/vav2player/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
--- a/vav2/platforms/android/applications/vav2player/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
+++ b/vav2/platforms/android/applications/vav2player/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
--- a/vav2/platforms/android/applications/vav2player/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
+++ b/vav2/platforms/android/applications/vav2player/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
--- a/vav2/platforms/android/applications/vav2player/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
+++ b/vav2/platforms/android/applications/vav2player/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
--- a/vav2/platforms/android/applications/vav2player/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
+++ b/vav2/platforms/android/applications/vav2player/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
--- a/vav2/platforms/android/applications/vav2player/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
+++ b/vav2/platforms/android/applications/vav2player/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
--- a/vav2/platforms/android/applications/vav2player/app/src/main/res/values/colors.xml
+++ b/vav2/platforms/android/applications/vav2player/app/src/main/res/values/colors.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="purple_200">#FFBB86FC</color>
+    <color name="purple_500">#FF6200EE</color>
+    <color name="purple_700">#FF3700B3</color>
+    <color name="teal_200">#FF03DAC5</color>
+    <color name="teal_700">#FF018786</color>
+    <color name="black">#FF000000</color>
+    <color name="white">#FFFFFFFF</color>
+</resources>
--- a/vav2/platforms/android/applications/vav2player/app/src/main/res/values/strings.xml
+++ b/vav2/platforms/android/applications/vav2player/app/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">Vav2Player_Android</string>
+</resources>
--- a/vav2/platforms/android/applications/vav2player/app/src/main/res/values/themes.xml
+++ b/vav2/platforms/android/applications/vav2player/app/src/main/res/values/themes.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="Theme.Vav2Player_Android" parent="android:Theme.Material.Light.NoActionBar" />
+</resources>
--- a/vav2/platforms/android/applications/vav2player/app/src/main/res/xml/backup_rules.xml
+++ b/vav2/platforms/android/applications/vav2player/app/src/main/res/xml/backup_rules.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+   Sample backup rules file; uncomment and customize as necessary.
+   See https://developer.android.com/guide/topics/data/autobackup
+   for details.
+   Note: This file is ignored for devices older than API 31
+   See https://developer.android.com/about/versions/12/backup-restore
+-->
+<full-backup-content>
+    <!--
+   <include domain="sharedpref" path="."/>
+   <exclude domain="sharedpref" path="device.xml"/>
+-->
+</full-backup-content>
--- a/vav2/platforms/android/applications/vav2player/app/src/main/res/xml/data_extraction_rules.xml
+++ b/vav2/platforms/android/applications/vav2player/app/src/main/res/xml/data_extraction_rules.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+   Sample data extraction rules file; uncomment and customize as necessary.
+   See https://developer.android.com/about/versions/12/backup-restore#xml-changes
+   for details.
+-->
+<data-extraction-rules>
+    <cloud-backup>
+        <!-- TODO: Use <include> and <exclude> to control what is backed up.
+        <include .../>
+        <exclude .../>
+        -->
+    </cloud-backup>
+    <!--
+    <device-transfer>
+        <include .../>
+        <exclude .../>
+    </device-transfer>
+    -->
+</data-extraction-rules>
--- a/vav2/platforms/android/applications/vav2player/app/src/test/java/com/ened/vav2player_android/ExampleUnitTest.kt
+++ b/vav2/platforms/android/applications/vav2player/app/src/test/java/com/ened/vav2player_android/ExampleUnitTest.kt
@@ -0,0 +1,17 @@
+package com.ened.vav2player_android
+
+import org.junit.Test
+
+import org.junit.Assert.*
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+    @Test
+    fun addition_isCorrect() {
+        assertEquals(4, 2 + 2)
+    }
+}
--- a/vav2/platforms/android/applications/vav2player/build.gradle.kts
+++ b/vav2/platforms/android/applications/vav2player/build.gradle.kts
@@ -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
+}
--- a/vav2/platforms/android/applications/vav2player/gradle.properties
+++ b/vav2/platforms/android/applications/vav2player/gradle.properties
@@ -0,0 +1,23 @@
+# Project-wide Gradle settings.
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. For more details, visit
+# https://developer.android.com/r/tools/gradle-multi-project-decoupled-projects
+# org.gradle.parallel=true
+# AndroidX package structure to make it clearer which packages are bundled with the
+# Android operating system, and which are packaged with your app's APK
+# https://developer.android.com/topic/libraries/support-library/androidx-rn
+android.useAndroidX=true
+# Kotlin code style for this project: "official" or "obsolete":
+kotlin.code.style=official
+# Enables namespacing of each library's R class so that its R class includes only the
+# resources declared in the library itself and none from the library's dependencies,
+# thereby reducing the size of the R class for that library
+android.nonTransitiveRClass=true
--- a/vav2/platforms/android/applications/vav2player/gradle/libs.versions.toml
+++ b/vav2/platforms/android/applications/vav2player/gradle/libs.versions.toml
@@ -0,0 +1,32 @@
+[versions]
+agp = "8.13.0"
+kotlin = "2.0.21"
+coreKtx = "1.17.0"
+junit = "4.13.2"
+junitVersion = "1.3.0"
+espressoCore = "3.7.0"
+lifecycleRuntimeKtx = "2.9.3"
+activityCompose = "1.10.1"
+composeBom = "2024.09.00"
+
+[libraries]
+androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
+junit = { group = "junit", name = "junit", version.ref = "junit" }
+androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
+androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
+androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" }
+androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" }
+androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" }
+androidx-compose-ui = { group = "androidx.compose.ui", name = "ui" }
+androidx-compose-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" }
+androidx-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
+androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
+androidx-compose-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
+androidx-compose-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
+androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3" }
+
+[plugins]
+android-application = { id = "com.android.application", version.ref = "agp" }
+kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
+
--- a/vav2/platforms/android/applications/vav2player/gradle/wrapper/gradle-wrapper.jar
+++ b/vav2/platforms/android/applications/vav2player/gradle/wrapper/gradle-wrapper.jar
--- a/vav2/platforms/android/applications/vav2player/gradle/wrapper/gradle-wrapper.properties
+++ b/vav2/platforms/android/applications/vav2player/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Sat Sep 27 11:39:06 KST 2025
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
--- a/vav2/platforms/android/applications/vav2player/gradlew
+++ b/vav2/platforms/android/applications/vav2player/gradlew
@@ -0,0 +1,185 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# 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.
+#
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+exec "$JAVACMD" "$@"
--- a/vav2/platforms/android/applications/vav2player/gradlew.bat
+++ b/vav2/platforms/android/applications/vav2player/gradlew.bat
@@ -0,0 +1,89 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
--- a/vav2/platforms/android/applications/vav2player/settings.gradle.kts
+++ b/vav2/platforms/android/applications/vav2player/settings.gradle.kts
@@ -0,0 +1,25 @@
+pluginManagement {
+    repositories {
+        google {
+            content {
+                includeGroupByRegex("com\\.android.*")
+                includeGroupByRegex("com\\.google.*")
+                includeGroupByRegex("androidx.*")
+            }
+        }
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
+rootProject.name = "Vav2Player_Android"
+include(":app")
+include(":vavcore")
+ 
--- a/vav2/platforms/android/applications/vav2player/vavcore/build.gradle
+++ b/vav2/platforms/android/applications/vav2player/vavcore/build.gradle
@@ -0,0 +1,70 @@
+plugins {
+    id 'com.android.library'
+}
+
+android {
+    namespace 'com.vavcore'
+    compileSdk 34
+
+    defaultConfig {
+        minSdk 21
+        targetSdk 34
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles "consumer-rules.pro"
+
+        ndk {
+            abiFilters 'arm64-v8a', 'armeabi-v7a'
+        }
+
+        externalNativeBuild {
+            cmake {
+                cppFlags "-std=c++17 -DANDROID -DVAVCORE_PLATFORM_ANDROID"
+                arguments "-DANDROID_STL=c++_shared"
+            }
+        }
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+
+    externalNativeBuild {
+        cmake {
+            path "src/main/cpp/CMakeLists.txt"
+            version "3.22.1"
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    sourceSets {
+        main {
+            java.srcDirs = ['src/main/java']
+            jniLibs.srcDirs = ['src/main/jniLibs']
+        }
+    }
+
+    prefab {
+        vavcore {
+            headers "src/main/cpp/include"
+        }
+    }
+}
+
+dependencies {
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'com.google.android.material:material:1.10.0'
+
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+}
--- a/vav2/platforms/android/applications/vav2player/vavcore/consumer-rules.pro
+++ b/vav2/platforms/android/applications/vav2player/vavcore/consumer-rules.pro
@@ -0,0 +1,12 @@
+# VavCore consumer ProGuard rules
+# These rules will be applied to projects that use VavCore as a dependency
+
+# Keep VavCore public API
+-keep class com.vavcore.VavCore {
+    public static <methods>;
+}
+
+# Keep native methods
+-keepclasseswithmembernames class * {
+    native <methods>;
+}
--- a/vav2/platforms/android/applications/vav2player/vavcore/proguard-rules.pro
+++ b/vav2/platforms/android/applications/vav2player/vavcore/proguard-rules.pro
@@ -0,0 +1,23 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+
+# VavCore JNI methods should not be obfuscated
+-keep class com.vavcore.VavCore {
+    native <methods>;
+    public static <methods>;
+}
+
+# Keep all native method declarations
+-keepclasseswithmembernames class * {
+    native <methods>;
+}
+
+# Android MediaCodec related classes
+-keep class android.media.** { *; }
+-dontwarn android.media.**
+
+# Standard Android rules for NDK
+-keep class * {
+    native <methods>;
+}
--- a/vav2/platforms/android/applications/vav2player/vavcore/src/main/cpp/CMakeLists.txt
+++ b/vav2/platforms/android/applications/vav2player/vavcore/src/main/cpp/CMakeLists.txt
@@ -0,0 +1,61 @@
+cmake_minimum_required(VERSION 3.22.1)
+project(vavcore-android)
+
+# Set C++ standard
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+# Platform definitions
+add_definitions(-DANDROID -DVAVCORE_PLATFORM_ANDROID)
+
+# Include directories
+include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../../VavCore/src
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../../VavCore/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../../platforms/android/include
+)
+
+# VavCore source files
+set(VAVCORE_SOURCES
+    # Core VavCore sources
+    ../../../VavCore/src/Decoder/VideoDecoderFactory.cpp
+    ../../../VavCore/src/Decoder/AV1Decoder.cpp
+    ../../../VavCore/src/Decoder/AndroidMediaCodecAV1Decoder.cpp
+    ../../../VavCore/src/FileIO/WebMFileReader.cpp
+
+    # JNI wrapper
+    vavcore_jni.cpp
+)
+
+# Create VavCore shared library
+add_library(vavcore-android SHARED ${VAVCORE_SOURCES})
+
+# Find required packages
+find_library(log-lib log)
+find_library(android-lib android)
+
+# Link libraries
+target_link_libraries(vavcore-android
+    ${log-lib}
+    ${android-lib}
+    mediandk    # Android MediaCodec NDK
+)
+
+# Add dav1d library if available
+set(DAV1D_LIB_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../../platforms/android/libs/${ANDROID_ABI}")
+if(EXISTS "${DAV1D_LIB_DIR}/libdav1d.so")
+    add_library(dav1d SHARED IMPORTED)
+    set_target_properties(dav1d PROPERTIES
+        IMPORTED_LOCATION ${DAV1D_LIB_DIR}/libdav1d.so
+    )
+    target_link_libraries(vavcore-android dav1d)
+    message(STATUS "Found dav1d library: ${DAV1D_LIB_DIR}/libdav1d.so")
+else()
+    message(WARNING "dav1d library not found at: ${DAV1D_LIB_DIR}/libdav1d.so")
+endif()
+
+# Export headers for other modules
+target_include_directories(vavcore-android PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}/include
+)
--- a/vav2/platforms/android/applications/vav2player/vavcore/src/main/cpp/vavcore_jni.cpp
+++ b/vav2/platforms/android/applications/vav2player/vavcore/src/main/cpp/vavcore_jni.cpp
@@ -0,0 +1,142 @@
+#include <jni.h>
+#include <android/log.h>
+#include <string>
+#include <memory>
+
+// VavCore includes
+#include "Decoder/VideoDecoderFactory.h"
+#include "Decoder/AndroidMediaCodecAV1Decoder.h"
+#include "Common/VideoTypes.h"
+
+#define LOG_TAG "VavCore-JNI"
+#define LOGI(...) __android_log_print(ANDROID_LOG_INFO, LOG_TAG, __VA_ARGS__)
+#define LOGE(...) __android_log_print(ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__)
+#define LOGW(...) __android_log_print(ANDROID_LOG_WARN, LOG_TAG, __VA_ARGS__)
+
+using namespace VavCore;
+
+extern "C" {
+
+JNIEXPORT jstring JNICALL
+Java_com_vavcore_VavCore_getVersion(JNIEnv *env, jclass clazz) {
+    return env->NewStringUTF("VavCore Android 1.0.0");
+}
+
+JNIEXPORT jboolean JNICALL
+Java_com_vavcore_VavCore_initializeVavCore(JNIEnv *env, jclass clazz) {
+    try {
+        LOGI("Initializing VavCore...");
+        VideoDecoderFactory::InitializeFactory();
+        LOGI("VavCore initialized successfully");
+        return JNI_TRUE;
+    } catch (const std::exception& e) {
+        LOGE("Failed to initialize VavCore: %s", e.what());
+        return JNI_FALSE;
+    }
+}
+
+JNIEXPORT jobjectArray JNICALL
+Java_com_vavcore_VavCore_getAvailableDecoders(JNIEnv *env, jclass clazz) {
+    try {
+        auto decoders = VideoDecoderFactory::GetAvailableDecoders(VideoCodecType::AV1);
+
+        // Create Java string array
+        jobjectArray result = env->NewObjectArray(decoders.size(),
+                                                 env->FindClass("java/lang/String"),
+                                                 env->NewStringUTF(""));
+
+        for (size_t i = 0; i < decoders.size(); i++) {
+            env->SetObjectArrayElement(result, i, env->NewStringUTF(decoders[i].c_str()));
+        }
+
+        LOGI("Found %zu available AV1 decoders", decoders.size());
+        return result;
+    } catch (const std::exception& e) {
+        LOGE("Failed to get available decoders: %s", e.what());
+        return env->NewObjectArray(0, env->FindClass("java/lang/String"), nullptr);
+    }
+}
+
+JNIEXPORT jboolean JNICALL
+Java_com_vavcore_VavCore_testMediaCodecDecoder(JNIEnv *env, jclass clazz) {
+    try {
+        LOGI("Testing MediaCodec decoder...");
+
+        // Try to create MediaCodec decoder
+        auto decoder = VideoDecoderFactory::CreateDecoder(VideoCodecType::AV1,
+                                                         VideoDecoderFactory::DecoderType::MEDIACODEC);
+        if (!decoder) {
+            LOGE("Failed to create MediaCodec decoder");
+            return JNI_FALSE;
+        }
+
+        LOGI("MediaCodec decoder created successfully: %s", decoder->GetCodecName().c_str());
+
+        // Test basic initialization
+        VideoMetadata metadata = {};
+        metadata.codec_type = VideoCodecType::AV1;
+        metadata.width = 1920;
+        metadata.height = 1080;
+
+        bool initialized = decoder->Initialize(metadata);
+        LOGI("MediaCodec decoder initialization: %s", initialized ? "SUCCESS" : "FAILED");
+
+        // Cleanup
+        decoder->Cleanup();
+
+        return initialized ? JNI_TRUE : JNI_FALSE;
+    } catch (const std::exception& e) {
+        LOGE("MediaCodec decoder test failed: %s", e.what());
+        return JNI_FALSE;
+    }
+}
+
+JNIEXPORT jboolean JNICALL
+Java_com_vavcore_VavCore_testDav1dDecoder(JNIEnv *env, jclass clazz) {
+    try {
+        LOGI("Testing dav1d decoder...");
+
+        // Try to create dav1d decoder
+        auto decoder = VideoDecoderFactory::CreateDecoder(VideoCodecType::AV1,
+                                                         VideoDecoderFactory::DecoderType::DAV1D);
+        if (!decoder) {
+            LOGE("Failed to create dav1d decoder");
+            return JNI_FALSE;
+        }
+
+        LOGI("dav1d decoder created successfully: %s", decoder->GetCodecName().c_str());
+
+        // Test basic initialization
+        VideoMetadata metadata = {};
+        metadata.codec_type = VideoCodecType::AV1;
+        metadata.width = 1920;
+        metadata.height = 1080;
+
+        bool initialized = decoder->Initialize(metadata);
+        LOGI("dav1d decoder initialization: %s", initialized ? "SUCCESS" : "FAILED");
+
+        // Cleanup
+        decoder->Cleanup();
+
+        return initialized ? JNI_TRUE : JNI_FALSE;
+    } catch (const std::exception& e) {
+        LOGE("dav1d decoder test failed: %s", e.what());
+        return JNI_FALSE;
+    }
+}
+
+JNIEXPORT jstring JNICALL
+Java_com_vavcore_VavCore_getDecoderInfo(JNIEnv *env, jclass clazz, jstring decoderName) {
+    try {
+        const char* decoder_name = env->GetStringUTFChars(decoderName, nullptr);
+        std::string info = VideoDecoderFactory::GetDecoderDescription(decoder_name);
+        env->ReleaseStringUTFChars(decoderName, decoder_name);
+
+        return env->NewStringUTF(info.c_str());
+    } catch (const std::exception& e) {
+        LOGE("Failed to get decoder info: %s", e.what());
+        return env->NewStringUTF("Error getting decoder info");
+    }
+}
+
+} // extern "C"
--- a/vav2/platforms/android/applications/vav2player/vavcore/src/main/java/com/vavcore/VavCore.java
+++ b/vav2/platforms/android/applications/vav2player/vavcore/src/main/java/com/vavcore/VavCore.java
@@ -0,0 +1,70 @@
+package com.vavcore;
+
+/**
+ * VavCore Android JNI Interface
+ * Provides access to VavCore AV1 decoding functionality from Java/Kotlin
+ */
+public class VavCore {
+    private static final String TAG = "VavCore";
+
+    // Load native library
+    static {
+        try {
+            System.loadLibrary("vavcore-android");
+        } catch (UnsatisfiedLinkError e) {
+            android.util.Log.e(TAG, "Failed to load VavCore native library", e);
+            throw e;
+        }
+    }
+
+    // Native method declarations
+    public static native String getVersion();
+    public static native boolean initializeVavCore();
+    public static native String[] getAvailableDecoders();
+    public static native boolean testMediaCodecDecoder();
+    public static native boolean testDav1dDecoder();
+    public static native String getDecoderInfo(String decoderName);
+
+    /**
+     * Initialize VavCore library
+     * Must be called before using any other VavCore functions
+     * @return true if initialization successful, false otherwise
+     */
+    public static boolean initialize() {
+        android.util.Log.i(TAG, "Initializing VavCore version: " + getVersion());
+        return initializeVavCore();
+    }
+
+    /**
+     * Test MediaCodec decoder availability and functionality
+     * @return true if MediaCodec decoder is working, false otherwise
+     */
+    public static boolean isMediaCodecAvailable() {
+        return testMediaCodecDecoder();
+    }
+
+    /**
+     * Test dav1d decoder availability and functionality
+     * @return true if dav1d decoder is working, false otherwise
+     */
+    public static boolean isDav1dAvailable() {
+        return testDav1dDecoder();
+    }
+
+    /**
+     * Get list of available AV1 decoders
+     * @return array of decoder names
+     */
+    public static String[] listAvailableDecoders() {
+        return getAvailableDecoders();
+    }
+
+    /**
+     * Get detailed information about a specific decoder
+     * @param decoderName name of the decoder
+     * @return decoder description
+     */
+    public static String getDecoderDescription(String decoderName) {
+        return getDecoderInfo(decoderName);
+    }
+}
--- a/vav2/platforms/android/tests/native/android_test.cpp
+++ b/vav2/platforms/android/tests/native/android_test.cpp
--- a/vav2/platforms/android/vavcore/CMakeLists.txt
+++ b/vav2/platforms/android/vavcore/CMakeLists.txt
@@ -26,7 +26,7 @@ add_compile_definitions(ANDROID)
 add_compile_definitions(__ANDROID_API__=${ANDROID_NATIVE_API_LEVEL})

 # VavCore source directory (relative to this CMakeLists.txt)
-set(VAVCORE_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../../../VavCore)
+set(VAVCORE_ROOT ${CMAKE_CURRENT_SOURCE_DIR})

 # Include directories
 include_directories(
--- a/vav2/platforms/android/vavcore/include/dav1d/common.h
+++ b/vav2/platforms/android/vavcore/include/dav1d/common.h
--- a/vav2/platforms/android/vavcore/include/dav1d/data.h
+++ b/vav2/platforms/android/vavcore/include/dav1d/data.h
--- a/vav2/platforms/android/vavcore/include/dav1d/dav1d.h
+++ b/vav2/platforms/android/vavcore/include/dav1d/dav1d.h
--- a/vav2/platforms/android/vavcore/include/dav1d/headers.h
+++ b/vav2/platforms/android/vavcore/include/dav1d/headers.h
--- a/vav2/platforms/android/vavcore/include/dav1d/meson.build
+++ b/vav2/platforms/android/vavcore/include/dav1d/meson.build
--- a/vav2/platforms/android/vavcore/include/dav1d/picture.h
+++ b/vav2/platforms/android/vavcore/include/dav1d/picture.h
--- a/vav2/platforms/android/vavcore/include/dav1d/version.h
+++ b/vav2/platforms/android/vavcore/include/dav1d/version.h
--- a/vav2/platforms/android/vavcore/src
+++ b/vav2/platforms/android/vavcore/src
@@ -0,0 +1 @@
+../../windows/vavcore/src