@stefanmartin/expo-video-watermark 0.3.3 → 0.4.1

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
@@ -228,6 +230,9 @@ class ExpoVideoWatermarkModule : Module() {
     val frameRate = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_CAPTURE_FRAMERATE)?.toFloatOrNull() ?: 0f
     val colorStandard = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_COLOR_STANDARD) ?: "unknown"
     val colorTransfer = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_COLOR_TRANSFER) ?: "unknown"
+    val colorTransferInt = colorTransfer.toIntOrNull()
+    // Check for HDR color transfer characteristics. 6 = PQ (ST2084), 7 = HLG. See MediaFormat constants.
+    val isHdr = colorTransferInt == 6 || colorTransferInt == 7
     retriever.release()
 
     // Build comprehensive video info string for debugging
@@ -237,7 +242,7 @@ class ExpoVideoWatermarkModule : Module() {
       append("duration=${duration}ms, ")
       append("frameRate=$frameRate, ")
       append("colorStandard=$colorStandard, ")
-      append("colorTransfer=$colorTransfer")
+      append("colorTransfer=$colorTransfer (isHdr=$isHdr)")
     }
     Log.d(TAG, "[Step 6] Video metadata: $videoInfo")
 
@@ -310,7 +315,8 @@ class ExpoVideoWatermarkModule : Module() {
     // Step 11: Create overlay effect with proper typing
     val overlayEffect = try {
       OverlayEffect(ImmutableList.of<TextureOverlay>(bitmapOverlay))
-    } catch (e: Exception) {
+    }
+    catch (e: Exception) {
       scaledWatermark.recycle()
       promise.reject("STEP11_OVERLAY_EFFECT_ERROR", "[Step 11] Failed to create overlay effect: ${e.message}", e)
       return
@@ -325,7 +331,7 @@ class ExpoVideoWatermarkModule : Module() {
     // Step 13: Create media item from video
     val mediaItem = MediaItem.fromUri("file://$cleanVideoPath")
 
-    // Step 14: Create edited media item with effects
+    // Step 14: Create edited media item (HDR mode is set on Composition, not EditedMediaItem in 1.9.1+)
     val editedMediaItem = try {
       EditedMediaItem.Builder(mediaItem)
         .setEffects(effects)
@@ -336,18 +342,28 @@ class ExpoVideoWatermarkModule : Module() {
       return
     }
 
-    // Step 14b: Create composition with HDR to SDR tone mapping
-    // Use MediaCodec-based tone mapping (avoids OpenGL frame processing issues on some devices)
+    // Step 14b: Create composition with EditedMediaItemSequence (required in Media3 1.9.1+)
     val composition = try {
-      Composition.Builder(listOf(editedMediaItem))
-        .setHdrMode(Composition.HDR_MODE_TONE_MAP_HDR_TO_SDR_USING_MEDIACODEC)
+      // 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)
       return
     }
-    Log.d(TAG, "[Step 14b] Created composition with HDR_MODE_TONE_MAP_HDR_TO_SDR_USING_MEDIACODEC")
+    Log.d(TAG, "[Step 14b] Composition created successfully.")
 
     // Handler for main thread callbacks
     val mainHandler = Handler(Looper.getMainLooper())

package/package.json

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