Additional fixes

Author: alan-george-lk

src/ffi_client.cpp

@@ -676,21 +676,13 @@ FfiClient::publishDataTrackAsync(std::uint64_t local_participant_handle,
                                     "FfiResponse missing publish_data_track"}));
       return pr.get_future();
     }
-  } catch (...) {
+  } catch (const std::exception &e) {
     cancelPendingByAsyncId(async_id);
     std::promise<Result<proto::OwnedLocalDataTrack, PublishDataTrackError>> pr;
-    try {
-      throw;
-    } catch (const std::exception &e) {
-      pr.set_value(
-          Result<proto::OwnedLocalDataTrack, PublishDataTrackError>::failure(
-              PublishDataTrackError{PublishDataTrackErrorCode::INTERNAL,
-                                    e.what()}));
-    } catch(...) {
-      pr.set_value(
-          Result<proto::OwnedLocalDataTrack, PublishDataTrackError>::failure(
-              PublishDataTrackError{PublishDataTrackErrorCode::INTERNAL, "unknown exception"}));
-    } 
+    pr.set_value(
+        Result<proto::OwnedLocalDataTrack, PublishDataTrackError>::failure(
+            PublishDataTrackError{PublishDataTrackErrorCode::INTERNAL,
+                                  e.what()}));
     return pr.get_future();
   }
 

src/video_frame.cpp

@@ -54,21 +54,20 @@ std::size_t computeBufferSize(int width, int height, VideoBufferType type) {
     return w * h * 3;
 
   case VideoBufferType::I420:
-  case VideoBufferType::NV12:
+    // Y (1 byte) + U (1 byte) + V (1 byte)
+  case VideoBufferType::NV12: {
+    // Y (1 byte) + UV interleaved (2 bytes per chroma sample)
+    const std::size_t chroma_w = (w + 1) / 2;
+    const std::size_t chroma_h = (h + 1) / 2;
+    return w * h + chroma_w * chroma_h * 2;
+  }
+
   case VideoBufferType::I010: {
-    // Y full, U and V subsampled 2x2
+    // 16 bits per sample in memory
+    // Y: 2 bytes per sample, U & V: 2 bytes per sample
     const std::size_t chroma_w = (w + 1) / 2;
     const std::size_t chroma_h = (h + 1) / 2;
-    if (type == VideoBufferType::I420) {
-      // Y (1 byte) + U (1 byte) + V (1 byte)
-      return w * h + chroma_w * chroma_h * 2;
-    } else if (type == VideoBufferType::NV12) {
-      // Y (1 byte), UV interleaved (2 bytes per chroma sample)
-      return w * h + chroma_w * chroma_h * 2;
-    } else { // I010, 16 bits per sample in memory
-      // Y: 2 bytes per sample, U & V: 2 bytes per sample
-      return w * h * 2 + chroma_w * chroma_h * 4;
-    }
+    return w * h * 2 + chroma_w * chroma_h * 4;
   }
 
   case VideoBufferType::I420A: {