Fixup memory issues

Author: Github Executorch

Yolo/android/app/src/main/java/com/example/executorchyolodemo/BirdDetectionActivity.java

@@ -100,25 +100,36 @@ protected void onCreate(Bundle savedInstanceState) {
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        
+
         // Clean up the detection pipeline
-        if (detectionPipeline != null) {
-            detectionPipeline.close();
-            detectionPipeline = null;
+        if (birdPipeline != null) {
+            birdPipeline.close();
+            birdPipeline = null;
+        }
+
+        // Shutdown camera executor
+        if (cameraExecutor != null) {
+            cameraExecutor.shutdown();
+        }
+
+        // Clean up session manager
+        if (sessionManager != null) {
+            sessionManager.cleanup();
         }
-        
+
         Log.d(TAG, "BirdDetectionActivity destroyed");
     }
 
     @Override
     protected void onPause() {
         super.onPause();
-        
-        // Optional: Release resources when app goes to background
-        if (detectionPipeline != null) {
-            detectionPipeline.close();
-            detectionPipeline = null;
-        }
+        Log.d(TAG, "BirdDetectionActivity paused");
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        updateSessionUI();
     }
 
     private void initializeViews() {
@@ -438,22 +449,4 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis
             }
         }
     }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        cameraExecutor.shutdown();
-        if (birdPipeline != null) {
-            birdPipeline.cleanup();
-        }
-        if (sessionManager != null) {
-            sessionManager.cleanup();
-        }
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        updateSessionUI();
-    }
 }

Yolo/android/app/src/main/java/com/example/executorchyolodemo/BirdDetectionPipeline.java

@@ -154,115 +154,97 @@ private void loadBirdSpeciesNames(Context context) throws IOException {
     public List<BirdDetection> detectBirds(Bitmap bitmap) {
         List<BirdDetection> results = new ArrayList<>();
         frameCounter++;
-    
+
         Tensor yoloInput = null;
         EValue[] yoloOutputs = null;
-        
+
         try {
             // Cleanup old detection history every 30 frames
             if (frameCounter % 30 == 0) {
                 cleanupOldDetections();
             }
-    
+
             yoloInput = preprocessForYolo(bitmap);
             if (yoloInput == null) {
                 return results;
             }
-    
+
             yoloOutputs = yoloModule.forward(EValue.from(yoloInput));
             if (yoloOutputs == null || yoloOutputs.length == 0) {
                 return results;
             }
-    
+
             List<Detection> detections = parseYoloV8OutputOptimized(yoloOutputs, bitmap.getWidth(), bitmap.getHeight());
-    
+
             if (DEBUG_OUTPUT) {
                 Log.d(TAG, "Raw detections before NMS: " + detections.size());
             }
-    
+
             // Apply enhanced NMS
             List<Detection> nmsDetections = applyEnhancedNMS(detections);
-    
+
             if (DEBUG_OUTPUT) {
                 Log.d(TAG, "Detections after NMS: " + nmsDetections.size());
             }
-    
+
             // Classify each detection
             for (Detection detection : nmsDetections) {
                 try {
                     Bitmap croppedBird = cropBitmap(bitmap, detection.boundingBox);
                     if (croppedBird == null) continue;
-    
-                    String species = classifyBird(croppedBird);
-                    
+
+                    String[] classificationResult = classifyBird(bitmap, detection.boundingBox);
+                    String species = (classificationResult != null && classificationResult.length > 0) ? classificationResult[0] : "Unknown Bird";
+
                     // Recycle the cropped bitmap immediately after classification
                     if (!croppedBird.isRecycled()) {
                         croppedBird.recycle();
                     }
-    
+
                     // Update detection history
                     DetectionHistory history = detectionHistory.get(detection.locationKey);
                     if (history == null) {
                         history = new DetectionHistory();
                         detectionHistory.put(detection.locationKey, history);
                     }
                     history.addConfidence(detection.confidence);
-    
+
                     // Apply temporal bonus for stable detections
                     float finalConfidence = detection.confidence;
                     if (history.isStable()) {
                         finalConfidence = Math.min(1.0f, detection.confidence + TEMPORAL_BONUS);
                     }
-    
+
                     BirdDetection birdDetection = new BirdDetection(
-                        detection.boundingBox,
-                        species,
-                        finalConfidence,
-                        history.isStable()
+                            detection.boundingBox,
+                            species,
+                            finalConfidence,
+                            history.isStable()
                     );
                     results.add(birdDetection);
-    
+
                     if (DEBUG_OUTPUT) {
                         Log.d(TAG, String.format("Bird detected: %s (%.2f) at [%.0f,%.0f,%.0f,%.0f] stable=%b",
-                            species, finalConfidence,
-                            detection.boundingBox.left, detection.boundingBox.top,
-                            detection.boundingBox.right, detection.boundingBox.bottom,
-                            history.isStable()));
+                                species, finalConfidence,
+                                detection.boundingBox.left, detection.boundingBox.top,
+                                detection.boundingBox.right, detection.boundingBox.bottom,
+                                history.isStable()));
                     }
                 } catch (Exception e) {
                     Log.e(TAG, "Error classifying detection", e);
                 }
             }
-    
+
             if (DEBUG_OUTPUT) {
                 Log.d(TAG, "Final bird detections: " + results.size());
             }
-    
+
         } catch (Exception e) {
             Log.e(TAG, "Error in detectBirds", e);
         } finally {
-            // CRITICAL: Release tensors to prevent memory leak
-            if (yoloInput != null) {
-                try {
-                    yoloInput.close();
-                } catch (Exception e) {
-                    Log.e(TAG, "Error closing yoloInput", e);
-                }
-            }
-            
-            if (yoloOutputs != null) {
-                for (EValue output : yoloOutputs) {
-                    if (output != null) {
-                        try {
-                            output.close();
-                        } catch (Exception e) {
-                            Log.e(TAG, "Error closing output", e);
-                        }
-                    }
-                }
-            }
+            // Note: ExecutorTorch handles tensor cleanup automatically via garbage collection
         }
-    
+
         return results;
     }
 
@@ -349,7 +331,7 @@ private void cleanupOldDetections() {
      */
     public void close() {
         Log.d(TAG, "Closing BirdDetectionPipeline and releasing resources");
-        
+
         try {
             if (yoloModule != null) {
                 yoloModule.destroy();
@@ -358,7 +340,7 @@ public void close() {
         } catch (Exception e) {
             Log.e(TAG, "Error destroying yoloModule", e);
         }
-        
+
         try {
             if (classifierModule != null) {
                 classifierModule.destroy();
@@ -367,12 +349,12 @@ public void close() {
         } catch (Exception e) {
             Log.e(TAG, "Error destroying classifierModule", e);
         }
-        
+
         // Clear detection history
         if (detectionHistory != null) {
             detectionHistory.clear();
         }
-        
+
         Log.d(TAG, "BirdDetectionPipeline closed successfully");
     }