@rejourneyco/react-native 1.0.2 → 1.0.4

package/android/src/main/java/com/rejourney/capture/CaptureEngine.kt

@@ -85,14 +85,13 @@ class CaptureEngine(private val context: Context) : VideoEncoderDelegate {
         var lastScanTime: Long = 0L
     )
 
-    // Configuration
     var captureScale: Float = Constants.DEFAULT_CAPTURE_SCALE
     var minFrameInterval: Double = Constants.DEFAULT_MIN_FRAME_INTERVAL
     var maxFramesPerMinute: Int = Constants.DEFAULT_MAX_FRAMES_PER_MINUTE
     var framesPerSegment: Int = Constants.DEFAULT_FRAMES_PER_SEGMENT
     var targetBitrate: Int = Constants.DEFAULT_VIDEO_BITRATE
     var targetFps: Int = Constants.DEFAULT_VIDEO_FPS
-    var hierarchyCaptureInterval: Int = 5 // Capture hierarchy every N frames
+    var hierarchyCaptureInterval: Int = 5
     var adaptiveQualityEnabled: Boolean = true
     var thermalThrottleEnabled: Boolean = true
     var batteryAwareEnabled: Boolean = true
@@ -121,60 +120,46 @@ class CaptureEngine(private val context: Context) : VideoEncoderDelegate {
             viewScanner?.config?.detectVideoLayers = value
         }
 
-    // Delegate for segment upload coordination
     var delegate: CaptureEngineDelegate? = null
 
-    // Read-only state
     var currentPerformanceLevel: PerformanceLevel = PerformanceLevel.NORMAL
         private set
     val frameCount: Int
         get() = videoEncoder?.currentFrameCount ?: 0
     
-    // FIX: Change this property getter to use explicit function body
     val isRecording: Boolean
     get() {
         return _isRecording && !isShuttingDown.get()
     }
     
-    
-    // Hierarchy tracking (matching iOS)
     private var framesSinceHierarchy: Int = 0
     
-    // Hierarchy snapshots accumulator
     private val hierarchySnapshots = mutableListOf<Map<String, Any?>>()
 
-    // Video encoder
     private var videoEncoder: VideoEncoder? = null
     private val segmentDir: File by lazy {
         File(context.filesDir, "rejourney/segments").apply { mkdirs() }
     }
 
-    // Motion tracker
     private val motionTracker = MotionTracker()
 
     private val captureHeuristics = CaptureHeuristics()
 
-    // Handler for main thread operations
     private val mainHandler = Handler(Looper.getMainLooper())
 
-    // Executor for background image processing
     private val processingExecutor = Executors.newSingleThreadExecutor()
 
-    // Coroutine scope for async operations
     private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
 
-    // Capture timer (1 FPS = every 1000ms, matches iOS RJCaptureEngine defaults)
     private var captureRunnable: Runnable? = null
     private val captureIntervalMs: Long
         get() = (1000L / targetFps).coerceAtLeast(100)
 
-    // Optimized bitmap object pool to reduce GC churn
     private val bitmapPool = ConcurrentLinkedQueue<Bitmap>()
-    private val MAX_POOL_SIZE = 8 // Increased pool size for better reuse
+    private val MAX_POOL_SIZE = 8
 
     var onFrameCaptured: (() -> Unit)? = null
 
-    // -- STATE PROPERTIES (Restored) --
     private val isShuttingDown = AtomicBoolean(false)
     private var _isRecording: Boolean = false
     private val captureInProgress = AtomicBoolean(false)
@@ -195,7 +180,6 @@ class CaptureEngine(private val context: Context) : VideoEncoderDelegate {
     private var lastSafeBitmap: Bitmap? = null
     private var lastCapturedHadBlockedSurface = false
     
-    // Throttling & Adaptive Quality State
     private var framesSinceSessionStart = 0
     private var framesThisMinute = 0
     private var minuteStartTime: Long = 0
@@ -204,24 +188,20 @@ class CaptureEngine(private val context: Context) : VideoEncoderDelegate {
     private var cooldownUntil: Long = 0
     private var didPrewarmViewCaches = false
     
-    // Battery Awareness
     private var cachedBatteryLevel: Float = 1.0f
     private var lastBatteryCheckTime: Long = 0L
 
-    // Device dimensions
     private var deviceWidth: Int = 0
     private var deviceHeight: Int = 0
     private var lastMapPresenceTimeMs: Long = 0L
 
     init {
-        // Pre-warm H.264 encoder in background
         try {
             VideoEncoder.prewarmEncoderAsync()
         } catch (e: Exception) {
             Logger.warning("[CaptureEngine] Encoder prewarm failed (non-critical): ${e.message}")
         }
         
-        // Pre-warm render server (Optimization 4)
         mainHandler.post {
             prewarmRenderServer()
         }
@@ -275,15 +255,12 @@ class CaptureEngine(private val context: Context) : VideoEncoderDelegate {
         PrivacyMask.maskWebViews = privacyMaskWebViews
         PrivacyMask.maskVideoLayers = privacyMaskVideoLayers
 
-        // Pre-warm privacy scanner class caches (matching iOS prewarmClassCaches)
-        // This eliminates ~10-15ms of cold-cache class lookups on first frame
         if (!didPrewarmViewCaches) {
             viewScanner?.prewarmClassCaches()
             PrivacyMask.prewarmClassCaches()
             didPrewarmViewCaches = true
         }
 
-        // Initialize video encoder
         videoEncoder = VideoEncoder(segmentDir).apply {
             this.targetBitrate = this@CaptureEngine.targetBitrate
             this.framesPerSegment = this@CaptureEngine.framesPerSegment
@@ -294,14 +271,11 @@ class CaptureEngine(private val context: Context) : VideoEncoderDelegate {
             this.keyframeInterval = Constants.DEFAULT_KEYFRAME_INTERVAL
             this.delegate = this@CaptureEngine
             setSessionId(sessionId)
-            prewarm()  // Pre-warm encoder to eliminate first-frame spike
+            prewarm()
         }
 
-        // Clean up any orphaned segments from previous sessions
         cleanupOldSegments()
         
-        // Start the first video segment
-        // This is required to set isRecording=true in the encoder so frames can be appended
         mainHandler.post {
             val window = getCurrentWindow()
             if (window != null) {
@@ -310,13 +284,11 @@ class CaptureEngine(private val context: Context) : VideoEncoderDelegate {
                     videoEncoder?.startSegment(decorView.width, decorView.height)
                     Logger.debug("[CaptureEngine] Started first segment: ${decorView.width}x${decorView.height}")
                 } else {
-                    // Defer segment start until we have valid dimensions
                     Logger.debug("[CaptureEngine] Deferring segment start - waiting for valid dimensions")
                 }
             }
         }
 
-        // Start capture timer
         startCaptureTimer()
 
         Logger.debug("[CaptureEngine] Session started: $sessionId")
@@ -333,13 +305,10 @@ class CaptureEngine(private val context: Context) : VideoEncoderDelegate {
         _isRecording = false
         stopCaptureTimer()
 
-        // Finish current segment (will trigger delegate callback)
         videoEncoder?.finishSegment()
         
-        // Upload any remaining hierarchy snapshots
         uploadCurrentHierarchySnapshots()
 
-        // OPTIMIZATION: Clean up resources
         cleanup()
         
         Logger.debug("[CaptureEngine] Session stopped")
@@ -349,14 +318,10 @@ class CaptureEngine(private val context: Context) : VideoEncoderDelegate {
      * OPTIMIZATION: Comprehensive cleanup to prevent memory leaks.
      */
     private fun cleanup() {
-        // Clean up video encoder
         videoEncoder = null
         
-        // Clean up bitmap resources
-        // Clear caches
         hierarchySnapshots.clear()
         
-        // Reset counters
         framesSinceSessionStart = 0
         framesSinceHierarchy = 0
         sessionId = null
@@ -371,7 +336,6 @@ class CaptureEngine(private val context: Context) : VideoEncoderDelegate {
         captureHeuristics.reset()
         resetCachedFrames()
         
-        // Cancel any pending operations
         scope.coroutineContext.cancelChildren()
     }
     
@@ -393,10 +357,8 @@ class CaptureEngine(private val context: Context) : VideoEncoderDelegate {
         
         stopCaptureTimer()
         
-        // Finish current segment
         videoEncoder?.finishSegment()
         
-        // Upload hierarchy snapshots
         uploadCurrentHierarchySnapshots()
     }
     
@@ -408,9 +370,6 @@ class CaptureEngine(private val context: Context) : VideoEncoderDelegate {
         
         Logger.info("[CaptureEngine] Resuming video capture")
 
-        // DEFENSIVE FIX: Warmup period
-        // When returning from background, the view hierarchy and layout may not be stable immediately.
-        // This is primarily an iOS issue but we apply it here for consistency and safety.
         isWarmingUp.set(true)
         Logger.debug("[CaptureEngine] Warmup started (200ms)")
         
@@ -419,7 +378,6 @@ class CaptureEngine(private val context: Context) : VideoEncoderDelegate {
             isWarmingUp.set(false)
             Logger.debug("[CaptureEngine] Warmup complete")
             
-            // Trigger immediate capture check
             if (_isRecording) {
                  requestCapture(CaptureImportance.MEDIUM, "warmup_complete", forceCapture = false)
             }
@@ -434,7 +392,6 @@ class CaptureEngine(private val context: Context) : VideoEncoderDelegate {
         idleCapturePending = false
         idleCaptureGeneration = 0
         
-        // Get window and start new segment
         mainHandler.post {
             val window = getCurrentWindow()
             if (window != null && videoEncoder != null) {
@@ -577,27 +534,12 @@ class CaptureEngine(private val context: Context) : VideoEncoderDelegate {
         return videoEncoder?.emergencyFlushSync() ?: false
     }
 
-    // ==================== VideoEncoderDelegate ====================
-
     override fun onSegmentFinished(segmentFile: File, startTime: Long, endTime: Long, frameCount: Int) {
         Logger.info("[CaptureEngine] Segment ready: ${segmentFile.name} ($frameCount frames, ${(endTime - startTime) / 1000.0}s)")
         
-        // Notify delegate of segment completion
         delegate?.onSegmentReady(segmentFile, startTime, endTime, frameCount)
         
-        // Upload accumulated hierarchy snapshots
         uploadCurrentHierarchySnapshots()
-        
-        // NOTE: Do NOT start a new segment here!
-        // VideoEncoder.finishSegmentAndContinue() already handles starting the next segment
-        // during automatic rotation (when segment reaches framesPerSegment limit).
-        // Starting a segment here causes a race condition where we try to finish an
-        // encoder that was just created, crashing with IllegalStateException in
-        // signalEndOfInputStream().
-        //
-        // New segments are now started by:
-        // 1. VideoEncoder.finishSegmentAndContinue() during rotation (internal)
-        // 2. captureFrameInternal() when recording but encoder not started yet
     }
 
     override fun onEncodingError(error: Exception) {
@@ -605,8 +547,6 @@ class CaptureEngine(private val context: Context) : VideoEncoderDelegate {
         delegate?.onCaptureError(error)
     }
 
-    // ==================== Private Methods ====================
-
     private fun captureFrame(importance: CaptureImportance, reason: String) {
         requestCapture(importance, reason, forceCapture = false)
     }
@@ -865,18 +805,15 @@ class CaptureEngine(private val context: Context) : VideoEncoderDelegate {
             return
         }
 
-        // Check cooldown
         val nowMs = System.currentTimeMillis()
         if (nowMs < cooldownUntil) {
             captureInProgress.set(false)
             return
         }
 
-        // Store device dimensions for reference
         deviceWidth = decorView.width
         deviceHeight = decorView.height
 
-        // Calculate scaled dimensions for bitmap
         var effectiveScale = captureScale
         if (!effectiveScale.isFinite() || effectiveScale <= 0f) {
             effectiveScale = Constants.DEFAULT_CAPTURE_SCALE
@@ -930,7 +867,6 @@ class CaptureEngine(private val context: Context) : VideoEncoderDelegate {
                         returnBitmap(bitmap)
                     }
                 } else {
-                    // PixelCopy not available pre-O; skip to avoid incorrect GPU capture
                     captureInProgress.set(false)
                     returnBitmap(bitmap)
                 }
@@ -995,24 +931,18 @@ class CaptureEngine(private val context: Context) : VideoEncoderDelegate {
 
         try {
             PerfTiming.time(PerfMetric.FRAME) {
-                // NUCLEAR FIX: Disable frame deduplication
-                // Previously we would skip frames with matching hashes, but this caused
-                // issues with MapView and other GPU-rendered content where the hash might
-                // not reflect visual changes. Always process every frame now.
                 val now = System.currentTimeMillis()
 
-                // OPTIMIZATION 2: Lazy privacy masking - only apply if sensitive rects exist
                 val shouldMask = privacyMaskTextInputs || privacyMaskCameraViews ||
                     privacyMaskWebViews || privacyMaskVideoLayers
                 val maskedBitmap = if (sensitiveRects.isNotEmpty() && shouldMask) {
                     PrivacyMask.applyMasksToBitmap(bitmap, sensitiveRects, rootWidth, rootHeight)
                 } else {
-                    bitmap // No masking needed - use original bitmap
+                    bitmap
                 }
 
                 val timestamp = System.currentTimeMillis()
 
-                // Append frame to video encoder
                 val success = encoder.appendFrame(maskedBitmap, timestamp)
 
                 if (success) {
@@ -1028,7 +958,6 @@ class CaptureEngine(private val context: Context) : VideoEncoderDelegate {
                     try {
                         onFrameCaptured?.invoke()
                     } catch (_: Exception) {
-                        // Best-effort only
                     }
                 }
 
@@ -1144,9 +1073,6 @@ class CaptureEngine(private val context: Context) : VideoEncoderDelegate {
         return rects
     }
     
-    
-    // Legacy bitmap hash - removed
-    
     /**
      * OPTIMIZATION 4: Render Server Pre-warming
      * Performs a dummy render to initialize the graphics subsystem/driver
@@ -1157,8 +1083,6 @@ class CaptureEngine(private val context: Context) : VideoEncoderDelegate {
             val window = getCurrentWindow() ?: return
             val bitmap = getBitmap(1, 1)
             val canvas = Canvas(bitmap)
-            // Draw a tiny part of the view hierarchy to warm up the rendering pipeline
-            // This pays the "first draw" cost (~50-100ms) now instead of during first capture
             window.decorView.draw(canvas)
             returnBitmap(bitmap)
             Logger.debug("[CaptureEngine] Render server pre-warmed")
@@ -1226,7 +1150,6 @@ class CaptureEngine(private val context: Context) : VideoEncoderDelegate {
         try {
             Logger.debug("[CaptureEngine] uploadCurrentHierarchySnapshots: Converting ${snapshotsToUpload.size} snapshots to JSON")
             
-            // Convert to JSON
             val jsonArray = JSONArray()
             for (snapshot in snapshotsToUpload) {
                 try {
@@ -1289,7 +1212,6 @@ class CaptureEngine(private val context: Context) : VideoEncoderDelegate {
     }
 
     private fun updatePerformanceLevel() {
-        // Check thermal state first (matching iOS RJPerformanceManager behavior)
         if (thermalThrottleEnabled && Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
             val thermalLevel = getThermalStatus()
             when (thermalLevel) {
@@ -1307,17 +1229,12 @@ class CaptureEngine(private val context: Context) : VideoEncoderDelegate {
                     currentPerformanceLevel = PerformanceLevel.REDUCED
                     return
                 }
-                // THERMAL_STATUS_NONE, THERMAL_STATUS_LIGHT - continue to battery check
             }
         }
         
-        // OPTIMIZATION: Battery-aware capture rate adjustment
-        // Reduces capture rate when battery is low to extend battery life
         currentPerformanceLevel = when {
             isLowBattery() && batteryAwareEnabled -> {
-                // Below 15% battery: reduce to minimal capture (0.25 FPS effective)
                 if (cachedBatteryLevel < 0.15f) PerformanceLevel.MINIMAL
-                // Below 30% battery: reduce capture rate (0.5 FPS effective)
                 else if (cachedBatteryLevel < 0.30f) PerformanceLevel.REDUCED
                 else PerformanceLevel.NORMAL
             }
@@ -1343,7 +1260,6 @@ class CaptureEngine(private val context: Context) : VideoEncoderDelegate {
     }
 
     private fun isLowBattery(): Boolean {
-        // Cache battery level for 15 seconds to avoid frequent calls
         val now = System.currentTimeMillis()
         if (now - lastBatteryCheckTime > 15000) {
             lastBatteryCheckTime = now
@@ -1362,23 +1278,19 @@ class CaptureEngine(private val context: Context) : VideoEncoderDelegate {
     private fun shouldCapture(importance: CaptureImportance): Boolean {
         val now = System.currentTimeMillis()
 
-        // Always allow critical captures
         if (importance == CaptureImportance.CRITICAL) {
             return true
         }
 
-        // Check minimum interval
         val elapsed = (now - lastCaptureTime) / 1000.0
         if (elapsed < minFrameInterval) {
             return false
         }
 
-        // Check frames per minute limit
         if (framesThisMinute >= maxFramesPerMinute) {
             return importance.value >= CaptureImportance.HIGH.value
         }
 
-        // Performance level checks
         return when (currentPerformanceLevel) {
             PerformanceLevel.PAUSED -> importance == CaptureImportance.CRITICAL
             PerformanceLevel.MINIMAL -> importance.value >= CaptureImportance.HIGH.value
@@ -1387,8 +1299,6 @@ class CaptureEngine(private val context: Context) : VideoEncoderDelegate {
         }
     }
 
-    // Legacy methods removed: checkLayoutSignature, isAnyGestureActiveInView, hasSpecialViewsInView
-
     private fun updateFrameRateTracking() {
         val now = System.currentTimeMillis()
         if (now - minuteStartTime >= 60_000) {
@@ -1435,8 +1345,6 @@ class CaptureEngine(private val context: Context) : VideoEncoderDelegate {
         return false
     }
     
-    // Legacy Detection Logic (Gesture/Special Views) Removed
-
     private fun startCaptureTimer() {
         stopCaptureTimer()
         captureRunnable = object : Runnable {
@@ -1456,20 +1364,15 @@ class CaptureEngine(private val context: Context) : VideoEncoderDelegate {
     }
 
     private fun getBitmap(width: Int, height: Int): Bitmap {
-        // OPTIMIZATION: Improved bitmap pool with size matching
         val pooled = bitmapPool.poll()
         if (pooled != null && !pooled.isRecycled) {
-            // Check if pooled bitmap can be reused (same or larger size)
             if (pooled.width >= width && pooled.height >= height) {
-                // Create a subset if the pooled bitmap is larger
                 if (pooled.width == width && pooled.height == height) {
                     return pooled
                 } else {
-                    // Return oversized bitmap to pool and create exact size
                     bitmapPool.offer(pooled)
                 }
             } else {
-                // Pooled bitmap too small, recycle it
                 pooled.recycle()
             }
         }
@@ -1477,10 +1380,9 @@ class CaptureEngine(private val context: Context) : VideoEncoderDelegate {
         return try {
             Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888)
         } catch (e: OutOfMemoryError) {
-            // Clear pool and try again
             clearBitmapPool()
-            System.gc() // Suggest garbage collection
-            Bitmap.createBitmap(width, height, Bitmap.Config.RGB_565) // Fallback to lower quality
+            System.gc()
+            Bitmap.createBitmap(width, height, Bitmap.Config.RGB_565)
         }
     }
 
@@ -1491,23 +1393,20 @@ class CaptureEngine(private val context: Context) : VideoEncoderDelegate {
     private fun returnBitmap(bitmap: Bitmap) {
         if (bitmap.isRecycled) return
         
-        // OPTIMIZATION: Stricter pool size limits based on memory pressure
         val maxPoolSize = when (currentPerformanceLevel) {
-            PerformanceLevel.MINIMAL, PerformanceLevel.PAUSED -> 2 // Minimal pool under pressure
-            PerformanceLevel.REDUCED -> 4 // Reduced pool
-            PerformanceLevel.NORMAL -> MAX_POOL_SIZE // Full pool
+            PerformanceLevel.MINIMAL, PerformanceLevel.PAUSED -> 2
+            PerformanceLevel.REDUCED -> 4
+            PerformanceLevel.NORMAL -> MAX_POOL_SIZE
         }
         
         if (bitmapPool.size < maxPoolSize) {
-            // Only pool bitmaps of reasonable size to avoid memory bloat
             val bitmapBytes = bitmap.byteCount
-            if (bitmapBytes < 2 * 1024 * 1024) { // Max 2MB per bitmap in pool
+            if (bitmapBytes < 2 * 1024 * 1024) {
                 bitmapPool.offer(bitmap)
                 return
             }
         }
         
-        // Pool full or bitmap too large - recycle immediately
         bitmap.recycle()
     }
     
@@ -1523,7 +1422,6 @@ class CaptureEngine(private val context: Context) : VideoEncoderDelegate {
         }
         if (recycledCount > 0) {
             Logger.debug("[CaptureEngine] Recycled $recycledCount pooled bitmaps")
-            // Suggest GC after clearing pool to reclaim memory quickly
             System.gc()
         }
     }
@@ -1547,7 +1445,7 @@ class CaptureEngine(private val context: Context) : VideoEncoderDelegate {
     private fun cleanupOldSegments() {
         scope.launch {
             try {
-                val cutoffTime = System.currentTimeMillis() - (24 * 60 * 60 * 1000) // 24 hours ago
+                val cutoffTime = System.currentTimeMillis() - (24 * 60 * 60 * 1000)
                 segmentDir.listFiles()?.forEach { file ->
                     if (file.isFile && file.name.endsWith(".mp4") && file.lastModified() < cutoffTime) {
                         file.delete()

package/android/src/main/java/com/rejourney/capture/SegmentUploader.kt

@@ -71,7 +71,6 @@ class SegmentUploader(
     private val pendingUploadCount = AtomicInteger(0)
     private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
 
-    // Use shared client with longer timeouts for video uploads (SSL pinning removed)
     private val client = HttpClientProvider.shared.newBuilder()
         .connectTimeout(60, TimeUnit.SECONDS)
         .readTimeout(120, TimeUnit.SECONDS)
@@ -114,7 +113,6 @@ class SegmentUploader(
         pendingUploadCount.incrementAndGet()
 
         try {
-            // Step 1: Request presigned URL from backend
             Logger.debug("[SegmentUploader] Requesting presigned URL for segment")
             val presignResult = requestPresignedURL(
                 sessionId = sessionId,
@@ -136,7 +134,6 @@ class SegmentUploader(
 
             Logger.debug("[SegmentUploader] Got presigned URL, segmentId=$segmentId")
 
-            // Step 2: Upload directly to S3
             Logger.debug("[SegmentUploader] Uploading to S3...")
             val uploadResult = uploadFileToS3(segmentFile, presignedUrl, "video/mp4")
 
@@ -147,7 +144,6 @@ class SegmentUploader(
 
             Logger.debug("[SegmentUploader] S3 upload SUCCESS, calling segment/complete")
 
-            // Step 3: Notify backend of completion
             val completeResult = notifySegmentComplete(
                 segmentId = segmentId!!,
                 sessionId = sessionId,
@@ -198,10 +194,8 @@ class SegmentUploader(
         pendingUploadCount.incrementAndGet()
 
         try {
-            // Compress data
             val compressedData = gzipData(hierarchyData)
             
-            // Request presigned URL for hierarchy upload with gzip compression
             val presignResult = requestPresignedURL(
                 sessionId = sessionId,
                 kind = "hierarchy",
@@ -220,7 +214,6 @@ class SegmentUploader(
             val presignedUrl = presignResult.presignedUrl
             val segmentId = presignResult.segmentId
 
-            // Upload compressed data to S3
             val uploadResult = uploadDataToS3(compressedData, presignedUrl, "application/gzip")
 
             if (!uploadResult.success) {
@@ -228,7 +221,6 @@ class SegmentUploader(
                 return@withContext SegmentUploadResult(false, uploadResult.error)
             }
 
-            // Notify backend of completion
             val completeResult = notifySegmentComplete(
                 segmentId = segmentId!!,
                 sessionId = sessionId,
@@ -264,7 +256,7 @@ class SegmentUploader(
      */
     fun cleanupOrphanedSegments(segmentDir: File) {
         try {
-            val cutoffTime = System.currentTimeMillis() - (24 * 60 * 60 * 1000) // 24 hours ago
+            val cutoffTime = System.currentTimeMillis() - (24 * 60 * 60 * 1000)
             segmentDir.listFiles()?.forEach { file ->
                 if (file.isFile && file.lastModified() < cutoffTime) {
                     file.delete()
@@ -276,7 +268,6 @@ class SegmentUploader(
         }
     }
 
-    // ==================== Private Methods ====================
 
     private data class PresignResult(
         val success: Boolean,
@@ -358,7 +349,6 @@ class SegmentUploader(
         attempt: Int = 1
     ): SegmentUploadResult = withContext(Dispatchers.IO) {
         try {
-            // Read file content directly (no gzip)
             val fileData = file.readBytes()
 
             val mediaType = contentType.toMediaType()
@@ -368,7 +358,6 @@ class SegmentUploader(
                 .url(presignedUrl)
                 .put(body)
                 .header("Content-Type", contentType)
-                // Removed Content-Encoding: gzip
                 .build()
 
             val response = client.newCall(request).execute()
@@ -401,7 +390,6 @@ class SegmentUploader(
         attempt: Int = 1
     ): SegmentUploadResult = withContext(Dispatchers.IO) {
         try {
-            // Upload data directly (no gzip)
             val mediaType = contentType.toMediaType()
             val body = data.toRequestBody(mediaType)
 
@@ -409,7 +397,6 @@ class SegmentUploader(
                 .url(presignedUrl)
                 .put(body)
                 .header("Content-Type", contentType)
-                // Removed Content-Encoding: gzip
                 .build()
 
             val response = client.newCall(request).execute()
@@ -506,7 +493,6 @@ class SegmentUploader(
     }
 
     private fun calculateBackoff(attempt: Int): Long {
-        // Exponential backoff: 1s, 2s, 4s, etc.
         return (1000L * (1 shl (attempt - 1))).coerceAtMost(30000L)
     }
 }