feat: sound audition flow (#122)

* audition rough poc

* fix: harden sound audition workflow

* refactor: consolidate sound audition state and waveform handling

* refactor: make sound audition playback host-agnostic

Author: knotbin

ios/Podfile.lock

@@ -1,20 +1,14 @@
 PODS:
-  - audio_waveforms (0.0.1):
-    - Flutter
   - Flutter (1.0.0)
 
 DEPENDENCIES:
-  - audio_waveforms (from `.symlinks/plugins/audio_waveforms/ios`)
   - Flutter (from `Flutter`)
 
 EXTERNAL SOURCES:
-  audio_waveforms:
-    :path: ".symlinks/plugins/audio_waveforms/ios"
   Flutter:
     :path: Flutter
 
 SPEC CHECKSUMS:
-  audio_waveforms: a6dde7fe7c0ea05f06ffbdb0f7c1b2b2ba6cedcf
   Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
 
 PODFILE CHECKSUM: e716c32704b29904c5fe233535ab45faecf8c549

ios/Runner.xcodeproj/project.pbxproj

@@ -209,7 +209,6 @@
 				97C146EC1CF9000F007C117D /* Resources */,
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
-				690D4588462089555B03AB06 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -305,23 +304,6 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
 		};
-		690D4588462089555B03AB06 /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		6CBBC3DF6451F183E15B477D /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;

lib/src/core/l10n/app_localizations.dart

@@ -166,6 +166,12 @@ abstract class AppLocalizations {
   /// **'Replace'**
   String get buttonReplace;
 
+  /// Change which part of the selected sound is used
+  ///
+  /// In en, this message translates to:
+  /// **'Adjust clip'**
+  String get buttonAdjustClip;
+
   /// Mute the selected audio track
   ///
   /// In en, this message translates to:
@@ -1354,6 +1360,18 @@ abstract class AppLocalizations {
   /// **'Select sound'**
   String get titleSelectSound;
 
+  /// Title for choosing which section of a sound plays over a video
+  ///
+  /// In en, this message translates to:
+  /// **'Select sound clip'**
+  String get labelSelectSoundClip;
+
+  /// Instruction below the video editor sound waveform
+  ///
+  /// In en, this message translates to:
+  /// **'Drag to choose the part that plays'**
+  String get hintDragWaveform;
+
   /// Placeholder for sound picker search input
   ///
   /// In en, this message translates to:

lib/src/core/l10n/app_localizations_en.dart

@@ -44,6 +44,9 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get buttonReplace => 'Replace';
 
+  @override
+  String get buttonAdjustClip => 'Adjust clip';
+
   @override
   String get buttonMute => 'Mute';
 
@@ -679,6 +682,12 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get titleSelectSound => 'Select sound';
 
+  @override
+  String get labelSelectSoundClip => 'Select sound clip';
+
+  @override
+  String get hintDragWaveform => 'Drag to choose the part that plays';
+
   @override
   String get hintSearchSounds => 'Search sounds';
 

lib/src/core/l10n/intl_en.arb

@@ -62,6 +62,11 @@
     "description": "Replace the selected media track"
   },
 
+  "buttonAdjustClip": "Adjust clip",
+  "@buttonAdjustClip": {
+    "description": "Change which part of the selected sound is used"
+  },
+
   "buttonMute": "Mute",
   "@buttonMute": {
     "description": "Mute the selected audio track"
@@ -1103,6 +1108,16 @@
     "description": "Title for the recorder sound picker"
   },
 
+  "labelSelectSoundClip": "Select sound clip",
+  "@labelSelectSoundClip": {
+    "description": "Title for choosing which section of a sound plays over a video"
+  },
+
+  "hintDragWaveform": "Drag to choose the part that plays",
+  "@hintDragWaveform": {
+    "description": "Instruction below the video editor sound waveform"
+  },
+
   "hintSearchSounds": "Search sounds",
   "@hintSearchSounds": {
     "description": "Placeholder for sound picker search input"

lib/src/core/pro_video_editor/models/audio_audition_timing.dart

@@ -0,0 +1,82 @@
+import 'package:pro_image_editor/pro_image_editor.dart';
+
+Duration audioSelectionDuration({
+  required Duration audioDuration,
+  required Duration selectionWindowDuration,
+}) {
+  if (audioDuration <= Duration.zero ||
+      selectionWindowDuration <= Duration.zero) {
+    return Duration.zero;
+  }
+  return audioDuration < selectionWindowDuration
+      ? audioDuration
+      : selectionWindowDuration;
+}
+
+AudioTrack audioTrackForAuditionRange(
+  AudioTrack track, {
+  required TrimDurationSpan playbackSpan,
+  Duration? sourceStart,
+}) {
+  final playbackDuration = playbackSpan.end - playbackSpan.start;
+  final selectionDuration = audioSelectionDuration(
+    audioDuration: track.duration,
+    selectionWindowDuration: playbackDuration,
+  );
+  final maximumStart = track.duration - selectionDuration;
+  var normalizedSourceStart =
+      sourceStart ?? track.audioStartTime ?? Duration.zero;
+  if (normalizedSourceStart < Duration.zero) {
+    normalizedSourceStart = Duration.zero;
+  }
+  if (normalizedSourceStart > maximumStart) {
+    normalizedSourceStart = maximumStart;
+  }
+  return track.copyWith(
+    audioStartTime: normalizedSourceStart,
+    audioEndTime: normalizedSourceStart + selectionDuration,
+    startTime: playbackSpan.start,
+    endTime: playbackSpan.end,
+    loop: track.duration < playbackDuration,
+  );
+}
+
+TrimDurationSpan audioTrackPreviewRange({
+  required AudioTrack track,
+  required Duration hostStart,
+  required Duration hostEnd,
+}) {
+  final trackStart = track.startTime ?? hostStart;
+  final trackEnd = track.endTime ?? hostEnd;
+  final previewStart = trackStart > hostStart ? trackStart : hostStart;
+  final previewEnd = trackEnd < hostEnd ? trackEnd : hostEnd;
+  if (previewEnd <= previewStart) {
+    return TrimDurationSpan(start: hostStart, end: hostEnd);
+  }
+  return TrimDurationSpan(start: previewStart, end: previewEnd);
+}
+
+double audioRangePlaybackProgress({
+  required Duration position,
+  required Duration rangeStart,
+  required Duration rangeEnd,
+}) {
+  final rangeDuration = rangeEnd - rangeStart;
+  if (rangeDuration <= Duration.zero) return 0;
+  return ((position - rangeStart).inMicroseconds / rangeDuration.inMicroseconds)
+      .clamp(0.0, 1.0)
+      .toDouble();
+}
+
+Duration? audioRangeLoopTarget({
+  required bool isPlaybackArmed,
+  required bool isPlaybackCompleted,
+  required Duration position,
+  required TrimDurationSpan range,
+}) {
+  final isOutsideRange = position < range.start || position >= range.end;
+  if (!isPlaybackArmed || (!isPlaybackCompleted && !isOutsideRange)) {
+    return null;
+  }
+  return range.start;
+}

lib/src/core/pro_video_editor/models/sound_audio_track.dart

@@ -77,7 +77,10 @@ String decodeSoundTrackAudioFileExtension(String? encoded) {
   if (encoded == null) return _fallbackAudioFileExtension;
   try {
     final map = jsonDecode(encoded) as Map<String, dynamic>;
-    return _normalizeAudioFileExtension(map['audioFileExtension'] as String?);
+    return _resolveAudioFormat(
+      extension: map['audioFileExtension'] as String?,
+      mimeType: map['audioMimeType'] as String?,
+    ).extension;
   } catch (_) {
     return _fallbackAudioFileExtension;
   }
@@ -87,10 +90,10 @@ String decodeSoundTrackAudioMimeType(String? encoded) {
   if (encoded == null) return 'audio/mpeg';
   try {
     final map = jsonDecode(encoded) as Map<String, dynamic>;
-    return _normalizeAudioMimeType(
-      map['audioMimeType'] as String?,
+    return _resolveAudioFormat(
       extension: map['audioFileExtension'] as String?,
-    );
+      mimeType: map['audioMimeType'] as String?,
+    ).mimeType;
   } catch (_) {
     return 'audio/mpeg';
   }
@@ -99,27 +102,27 @@ String decodeSoundTrackAudioMimeType(String? encoded) {
 String audioFileExtension(AudioView audio) {
   final record = audio.localRecord;
   if (record is PlyrTrackRecord) {
-    return _normalizeAudioFileExtension(
-      record.fileType,
+    return _resolveAudioFormat(
+      extension: record.fileType,
       mimeType: record.audioBlob?.mimeType,
-    );
+    ).extension;
   }
   if (record is AudioRecord) {
-    return _normalizeAudioFileExtension(null, mimeType: record.sound.mimeType);
+    return _resolveAudioFormat(mimeType: record.sound.mimeType).extension;
   }
   return _fallbackAudioFileExtension;
 }
 
 String audioMimeType(AudioView audio) {
   final record = audio.localRecord;
   if (record is PlyrTrackRecord) {
-    return _normalizeAudioMimeType(
-      record.audioBlob?.mimeType,
+    return _resolveAudioFormat(
       extension: record.fileType,
-    );
+      mimeType: record.audioBlob?.mimeType,
+    ).mimeType;
   }
   if (record is AudioRecord) {
-    return _normalizeAudioMimeType(record.sound.mimeType);
+    return _resolveAudioFormat(mimeType: record.sound.mimeType).mimeType;
   }
   return 'audio/mpeg';
 }
@@ -172,55 +175,58 @@ bool _isSparkMediaSoundUrl(String url) {
       uri.pathSegments.first == 'sound';
 }
 
-String _normalizeAudioFileExtension(String? value, {String? mimeType}) {
-  final extension = value?.trim().toLowerCase().replaceFirst('.', '');
-  if (extension != null && extension.isNotEmpty) {
-    final normalized = switch (extension) {
-      'mpeg' => 'mp3',
-      'mp4' => 'm4a',
-      'x-m4a' => 'm4a',
-      'x-wav' => 'wav',
-      _ => extension.replaceAll(RegExp(r'[^a-z0-9]'), ''),
-    };
-    if (normalized.isNotEmpty) return normalized;
-  }
-
-  final subtype = mimeType?.split('/').last.trim().toLowerCase();
-  return switch (subtype) {
-    'mpeg' => 'mp3',
-    'mp3' => 'mp3',
-    'mp4' => 'm4a',
-    'm4a' => 'm4a',
-    'x-m4a' => 'm4a',
-    'aac' => 'aac',
-    'vnd.wave' => 'wav',
-    'wave' => 'wav',
-    'wav' => 'wav',
-    'x-wav' => 'wav',
-    'flac' => 'flac',
-    'ogg' => 'ogg',
-    _ => _fallbackAudioFileExtension,
+_AudioFormat _resolveAudioFormat({String? extension, String? mimeType}) {
+  final normalizedMime = mimeType?.trim().toLowerCase();
+  final mimeFormat = switch (normalizedMime) {
+    'audio/mpeg' || 'audio/mp3' => const _AudioFormat('mp3', 'audio/mpeg'),
+    'audio/mp4' ||
+    'audio/m4a' ||
+    'audio/x-m4a' => const _AudioFormat('m4a', 'audio/mp4'),
+    'audio/aac' => const _AudioFormat('aac', 'audio/aac'),
+    'audio/vnd.wave' ||
+    'audio/wave' ||
+    'audio/wav' ||
+    'audio/x-wav' => const _AudioFormat('wav', 'audio/wav'),
+    'audio/flac' || 'audio/x-flac' => const _AudioFormat('flac', 'audio/flac'),
+    'audio/ogg' => const _AudioFormat('ogg', 'audio/ogg'),
+    _ => null,
   };
-}
+  if (mimeFormat != null) return mimeFormat;
+
+  final normalizedExtension = extension
+      ?.trim()
+      .toLowerCase()
+      .replaceFirst('.', '')
+      .replaceAll(RegExp(r'[^a-z0-9]'), '');
+  final extensionFormat = switch (normalizedExtension) {
+    'mpeg' || 'mp3' => const _AudioFormat('mp3', 'audio/mpeg'),
+    'mp4' || 'm4a' || 'xm4a' => const _AudioFormat('m4a', 'audio/mp4'),
+    'aac' => const _AudioFormat('aac', 'audio/aac'),
+    'vndwave' ||
+    'wave' ||
+    'wav' ||
+    'xwav' => const _AudioFormat('wav', 'audio/wav'),
+    'flac' || 'xflac' => const _AudioFormat('flac', 'audio/flac'),
+    'ogg' => const _AudioFormat('ogg', 'audio/ogg'),
+    _ => null,
+  };
+  if (extensionFormat != null) return extensionFormat;
 
-String _normalizeAudioMimeType(String? mimeType, {String? extension}) {
-  final normalizedMime = mimeType?.trim().toLowerCase();
   if (normalizedMime != null && normalizedMime.startsWith('audio/')) {
-    return switch (normalizedMime) {
-      'audio/x-m4a' => 'audio/mp4',
-      'audio/vnd.wave' => 'audio/wav',
-      'audio/wave' => 'audio/wav',
-      'audio/x-wav' => 'audio/wav',
-      _ => normalizedMime,
-    };
+    final subtype = normalizedMime
+        .substring('audio/'.length)
+        .replaceAll(RegExp(r'[^a-z0-9]'), '');
+    if (subtype.isNotEmpty) return _AudioFormat(subtype, normalizedMime);
   }
+  if (normalizedExtension != null && normalizedExtension.isNotEmpty) {
+    return _AudioFormat(normalizedExtension, 'audio/$normalizedExtension');
+  }
+  return const _AudioFormat(_fallbackAudioFileExtension, 'audio/mpeg');
+}
 
-  return switch (_normalizeAudioFileExtension(extension)) {
-    'm4a' => 'audio/mp4',
-    'aac' => 'audio/aac',
-    'wav' => 'audio/wav',
-    'flac' => 'audio/flac',
-    'ogg' => 'audio/ogg',
-    _ => 'audio/mpeg',
-  };
+class _AudioFormat {
+  const _AudioFormat(this.extension, this.mimeType);
+
+  final String extension;
+  final String mimeType;
 }