@stefanmartin/expo-video-watermark 0.4.0 → 0.4.2

package/android/build.gradle

@@ -19,7 +19,7 @@ android {
 }
 
 dependencies {
-  def media3_version = "1.9.1"
+  def media3_version = "1.8.0"
 
   // Core Editing & Transformation
   api "androidx.media3:media3-transformer:$media3_version"

package/android/src/main/java/expo/modules/videowatermark/ExpoVideoWatermarkModule.kt

@@ -19,6 +19,8 @@ import androidx.media3.effect.StaticOverlaySettings
 import androidx.media3.effect.TextureOverlay
 import androidx.media3.transformer.Composition
 import androidx.media3.transformer.EditedMediaItem
+import androidx.media3.transformer.EditedMediaItemSequence
+import androidx.media3.common.C
 import androidx.media3.transformer.Effects
 import androidx.media3.transformer.ExportException
 import androidx.media3.transformer.ExportResult
@@ -329,27 +331,33 @@ class ExpoVideoWatermarkModule : Module() {
     // Step 13: Create media item from video
     val mediaItem = MediaItem.fromUri("file://$cleanVideoPath")
 
-    // Step 14: Create edited media item, requesting HDR to SDR tone-mapping if needed.
-    // This is the modern API for handling HDR in Media3, replacing the deprecated setHdrMode.
+    // Step 14: Create edited media item (HDR mode is set on Composition, not EditedMediaItem in 1.9.1+)
     val editedMediaItem = try {
-      val builder = EditedMediaItem.Builder(mediaItem).setEffects(effects)
-      if (isHdr) {
-        Log.d(TAG, "[Step 14] HDR video detected. Requesting tone-mapping.")
-        builder.setForceHdrToSdrToneMap(true)
-      } else {
-        Log.d(TAG, "[Step 14] SDR video detected. No tone-mapping needed.")
-      }
-      builder.build()
+      EditedMediaItem.Builder(mediaItem)
+        .setEffects(effects)
+        .build()
     } catch (e: Exception) {
       scaledWatermark.recycle()
       promise.reject("STEP14_EDITED_MEDIA_ERROR", "[Step 14] Failed to create edited media item: ${e.message}", e)
       return
     }
 
-    // Step 14b: Create composition
+    // Step 14b: Create composition with EditedMediaItemSequence (required in Media3 1.9.1+)
     val composition = try {
-      Composition.Builder(listOf(editedMediaItem))
+      // Wrap EditedMediaItem in a sequence (must specify track types in 1.9.1+)
+      val sequence = EditedMediaItemSequence.Builder(setOf(C.TRACK_TYPE_VIDEO, C.TRACK_TYPE_AUDIO))
+        .addItem(editedMediaItem)
         .build()
+
+      // Build composition with HDR mode if needed
+      val compositionBuilder = Composition.Builder(sequence)
+      if (isHdr) {
+        Log.d(TAG, "[Step 14b] HDR video detected. Applying tone-mapping to composition.")
+        compositionBuilder.setHdrMode(Composition.HDR_MODE_TONE_MAP_HDR_TO_SDR_USING_MEDIACODEC)
+      } else {
+        Log.d(TAG, "[Step 14b] SDR video detected. No tone-mapping needed.")
+      }
+      compositionBuilder.build()
     } catch (e: Exception) {
       scaledWatermark.recycle()
       promise.reject("STEP14B_COMPOSITION_ERROR", "[Step 14b] Failed to create composition: ${e.message}", e)
@@ -375,7 +383,7 @@ class ExpoVideoWatermarkModule : Module() {
           .addListener(object : Transformer.Listener {
             override fun onCompleted(composition: Composition, exportResult: ExportResult) {
               Log.d(TAG, "[Step 15] Transform completed successfully")
-              Log.d(TAG, "[Step 15] Export result - durationMs: ${exportResult.durationMs}, " +
+              Log.d(TAG, "[Step 15] Export result - durationMillis: ${exportResult.durationMillis}, " +
                 "fileSizeBytes: ${exportResult.fileSizeBytes}, " +
                 "averageAudioBitrate: ${exportResult.averageAudioBitrate}, " +
                 "averageVideoBitrate: ${exportResult.averageVideoBitrate}, " +
@@ -411,7 +419,7 @@ class ExpoVideoWatermarkModule : Module() {
                 .addListener(object : Transformer.Listener {
                   override fun onCompleted(composition: Composition, hevcExportResult: ExportResult) {
                     Log.d(TAG, "[Step 16] H.265 re-encode completed successfully")
-                    Log.d(TAG, "[Step 16] Export result - durationMs: ${hevcExportResult.durationMs}, " +
+                    Log.d(TAG, "[Step 16] Export result - durationMillis: ${hevcExportResult.durationMillis}, " +
                       "fileSizeBytes: ${hevcExportResult.fileSizeBytes}, " +
                       "averageAudioBitrate: ${hevcExportResult.averageAudioBitrate}, " +
                       "averageVideoBitrate: ${hevcExportResult.averageVideoBitrate}, " +
@@ -501,7 +509,7 @@ class ExpoVideoWatermarkModule : Module() {
                 appendLine()
                 appendLine("--- Output Info ---")
                 appendLine("Output path: $cleanOutputPath")
-                appendLine("Partial export result - durationMs: ${exportResult.durationMs}, " +
+                appendLine("Partial export result - durationMillis: ${exportResult.durationMillis}, " +
                   "fileSizeBytes: ${exportResult.fileSizeBytes}")
                 appendLine()
                 appendLine("--- Full Stack Trace ---")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stefanmartin/expo-video-watermark",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "description": "Creating video watermarks on locally stored videos",
   "main": "build/index.js",
   "types": "build/index.d.ts",