-
Notifications
You must be signed in to change notification settings - Fork 29
Audio playback window #465
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
aaravlu
wants to merge
49
commits into
project-robius:main
Choose a base branch
from
aaravlu:audio-playback-window
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
49 commits
Select commit
Hold shift + click to select a range
e530f81
Remove dont support audio prompt
aaravlu 3c26329
Remove TODO prompt & add basic
aaravlu 6f1704a
Add svg file 'download'
aaravlu 7fffb21
Add audio player base
aaravlu 7402dd4
Change message in timeline
aaravlu acc3c36
Finished Audio view base
aaravlu 9e632c0
audio playing issues
aaravlu 38c6cec
Every audio player possess a sink
aaravlu d973965
Finished pause functionality
aaravlu ab559ed
Merge branch 'main' into fix120
aaravlu 39b1fd9
Resolve conflicts
aaravlu 1bc325e
Merge branch 'main' into fix120
aaravlu 7540d59
Change audio button color
aaravlu d63ac99
Replace field 'inisialized' with func 'after_new_from_doc'
aaravlu e5fa09a
Optimize button UI
aaravlu cfc158c
Merge branch 'main' into fix120
aaravlu 07c5199
Update 'Cargo.lock'
aaravlu 9364026
Merge branch 'main' into fix120
aaravlu 47a92aa
Audio player base
aaravlu 550b6c9
Audio Player base
aaravlu fc6a0ba
Play Noise
aaravlu 0504c86
All audios use one sink
aaravlu a290732
Merge branch 'main' into fix120
aaravlu e381073
Complish audio player base
aaravlu 0200e67
Remove '.log' file
aaravlu fe3062a
Fix media cache fecthing failed
aaravlu ea1b4d4
Add fetching prompt for audio message
aaravlu e3b6a8a
Refactor audio module
aaravlu 48dd0a6
Correct audio position
aaravlu 82744ab
Remove redadant svg files
aaravlu d4f4565
Update src/home/room_screen.rs
aaravlu c5f7f96
Update src/audio/audio_controller.rs
aaravlu f1177b6
Fix copilot review errors
aaravlu f57eac1
revert 'Cargo.lock' to main
aaravlu 5c679e5
Remove play & pause icon const
aaravlu 979f36a
Fix doc
aaravlu dd1c3ba
Restore audio message ui status when being dropped
aaravlu 6de0fcd
Not fixed
aaravlu 379483b
feat(audio): add playback window and improve audio handling
aaravlu 86d1eaf
Merge branch 'main' into audio-playback-window
aaravlu 1ae5314
Resolve conflicts
aaravlu f3c545a
Update src/audio/audio_playback_window.rs
aaravlu 6956529
Define WAV_HEADER_SIZE
aaravlu 61a12a2
Update src/audio/audio_controller.rs
aaravlu db7c492
Add prompt
aaravlu acc67a1
Clean junk code up
aaravlu be551e3
Clean junk code
aaravlu 27ac92e
Merge branch 'main' into audio-playback-window
aaravlu 9e9d6bb
Resolve conflicts
aaravlu File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,284 @@ | ||
//! Audio controller, which just manages audio playback. | ||
|
||
use std::{collections::{hash_map::Entry, HashMap}, sync::{Arc, LazyLock, Mutex, RwLock}}; | ||
use makepad_widgets::*; | ||
use matrix_sdk_ui::timeline::TimelineEventItemId; | ||
|
||
use super::audio_message_ui::AudioMessageUIAction; | ||
|
||
/// `Arc<Mutex<usize>>` is an audio playing position. | ||
/// `Arc<Mutex<bool>>` is whether this audio is playing or not. | ||
type Audios = HashMap<TimelineEventItemId, (Audio, Arc<Mutex<usize>>, Arc<Mutex<bool>>)>; | ||
|
||
pub const WAV_HEADER_SIZE: usize = 44; | ||
|
||
// Is there any other better way instead using Rwlock? Can we just post action `makepad` to replace this? | ||
pub static AUDIO_SET: LazyLock<RwLock<Audios>> = LazyLock::new(||{ | ||
RwLock::new(HashMap::new()) | ||
}); | ||
|
||
live_design! { | ||
use link::theme::*; | ||
use link::shaders::*; | ||
use link::widgets::*; | ||
|
||
use crate::shared::styles::*; | ||
use crate::shared::icon_button::*; | ||
|
||
// width & height is 0 because it is just a template. | ||
pub AudioController = {{AudioController}} { | ||
width: 0., height: 0., | ||
visible: false, | ||
} | ||
} | ||
|
||
#[derive(Debug, Clone, DefaultNone)] | ||
pub enum AudioControllerAction { | ||
UiToPause(TimelineEventItemId), | ||
None, | ||
} | ||
|
||
#[derive(Debug, Clone, Default)] | ||
pub struct Audio { | ||
pub data: Arc<[u8]>, | ||
pub channels: u16, | ||
pub bit_depth: u16 | ||
} | ||
|
||
#[derive(Debug, Clone, Default)] | ||
pub enum Selected { | ||
Playing(TimelineEventItemId, usize), | ||
Paused(TimelineEventItemId, usize), | ||
#[default] | ||
None, | ||
} | ||
|
||
#[derive(Live, LiveHook, Widget)] | ||
pub struct AudioController { | ||
#[deref] view: View, | ||
#[rust] audio: Arc<Mutex<Audio>>, | ||
#[rust] selected: Arc<Mutex<Selected>>, | ||
} | ||
|
||
impl Widget for AudioController { | ||
fn handle_event(&mut self, cx: &mut Cx, event: &Event, scope: &mut Scope) { | ||
self.match_event(cx, event); | ||
self.view.handle_event(cx, event, scope); | ||
} | ||
|
||
fn draw_walk(&mut self, cx: &mut Cx2d, scope: &mut Scope, walk: Walk) -> DrawStep { | ||
self.view.draw_walk(cx, scope, walk) | ||
} | ||
} | ||
|
||
impl MatchEvent for AudioController { | ||
fn handle_startup(&mut self, cx: &mut Cx) { | ||
let audio = self.audio.clone(); | ||
let selected = self.selected.clone(); | ||
cx.audio_output(0, move |_audio_info, output_buffer|{ | ||
let mut selected_mg = selected.lock().unwrap(); | ||
let audio_mg = audio.lock().unwrap(); | ||
if let Selected::Playing(ref id, mut pos) = selected_mg.clone() { | ||
let audio = audio_mg.clone(); | ||
let audio_data_len = audio.data.len(); | ||
match (audio.channels, audio.bit_depth) { | ||
(2, 16) => { | ||
// stereo 16bit | ||
output_buffer.zero(); | ||
let (left, right) = output_buffer.stereo_mut(); | ||
for i in 0..left.len() { | ||
if pos + 4 < audio_data_len { | ||
let left_i16 = i16::from_le_bytes([audio.data[pos], audio.data[pos + 1]]); | ||
let right_i16 = i16::from_le_bytes([audio.data[pos + 2], audio.data[pos + 3]]); | ||
left[i] = left_i16 as f32 / i16::MAX as f32; | ||
right[i] = right_i16 as f32 / i16::MAX as f32; | ||
pos += 4; | ||
*selected_mg = Selected::Playing(id.clone(), pos); | ||
} else { | ||
break; | ||
} | ||
} | ||
} | ||
(2, 24) => { | ||
// stereo 24bit | ||
output_buffer.zero(); | ||
let (left, right) = output_buffer.stereo_mut(); | ||
for i in 0..left.len() { | ||
if pos + 5 < audio_data_len { | ||
let left_i32 = i32::from_le_bytes([0, audio.data[pos], audio.data[pos + 1], audio.data[pos + 2]]); | ||
let right_i32 = i32::from_le_bytes([0, audio.data[pos + 3], audio.data[pos + 4], audio.data[pos + 5]]); | ||
left[i] = left_i32 as f32 / i32::MAX as f32; | ||
right[i] = right_i32 as f32 / i32::MAX as f32; | ||
pos += 6; | ||
*selected_mg = Selected::Playing(id.clone(), pos); | ||
} else { | ||
break; | ||
} | ||
} | ||
} | ||
(2, 32) => { | ||
// stereo 32bit | ||
output_buffer.zero(); | ||
let (left, right) = output_buffer.stereo_mut(); | ||
for i in 0..left.len() { | ||
if pos + 7 < audio_data_len { | ||
let left_i32 = i32::from_le_bytes([audio.data[pos], audio.data[pos + 1], audio.data[pos + 2], audio.data[pos + 3]]); | ||
let right_i32 = i32::from_le_bytes([audio.data[pos + 4], audio.data[pos + 5], audio.data[pos + 6], audio.data[pos + 7]]); | ||
left[i] = left_i32 as f32 / i32::MAX as f32; | ||
right[i] = right_i32 as f32 / i32::MAX as f32; | ||
pos += 8; | ||
*selected_mg = Selected::Playing(id.clone(), pos); | ||
} else { | ||
break; | ||
} | ||
} | ||
} | ||
_ => { } | ||
} | ||
|
||
// Use `pos + audio.bit_depth.ilog2()` rather than `pos` to ensure no panic when computing isize mentioned above. | ||
if pos + audio.bit_depth.ilog2() as usize > audio_data_len - 1 { | ||
if let Some((_audio, _old_pos, old_playing_status)) = AUDIO_SET.read().unwrap().get(id) { | ||
*old_playing_status.lock().unwrap() = false; | ||
} | ||
Cx::post_action(AudioControllerAction::UiToPause(id.clone())); | ||
*selected_mg = Selected::None; | ||
} | ||
} else { | ||
output_buffer.zero(); | ||
} | ||
}); | ||
} | ||
|
||
fn handle_audio_devices(&mut self, cx: &mut Cx, e: &AudioDevicesEvent) { | ||
cx.use_audio_outputs(&e.default_output()) | ||
} | ||
fn handle_actions(&mut self, cx: &mut Cx, actions: &Actions) { | ||
for action in actions { | ||
match action.downcast_ref() { | ||
Some(AudioMessageUIAction::Play(new_id)) => { | ||
let selected = self.selected.lock().unwrap().clone(); | ||
match selected { | ||
Selected::Playing(current_id, current_pos) => { | ||
if current_id != new_id.clone() { | ||
cx.action(AudioControllerAction::UiToPause(current_id.clone())); | ||
restore_audio_play_status(¤t_id, current_pos); | ||
self.switch_to_audio(new_id); | ||
} | ||
} | ||
Selected::Paused(current_id, current_pos) => { | ||
if ¤t_id == new_id { | ||
*self.selected.lock().unwrap() = Selected::Playing(new_id.clone(), current_pos); | ||
} else { | ||
restore_audio_play_status(¤t_id, current_pos); | ||
self.switch_to_audio(new_id); | ||
} | ||
} | ||
Selected::None => { | ||
self.switch_to_audio(new_id); | ||
} | ||
} | ||
} | ||
Some(AudioMessageUIAction::Pause(new_id)) => { | ||
let mut selected_mg = self.selected.lock().unwrap(); | ||
if let Selected::Playing(current_id, current_pos) = selected_mg.clone() { | ||
if ¤t_id == new_id { | ||
restore_audio_play_status(¤t_id, current_pos); | ||
*selected_mg = Selected::Paused(new_id.clone(), current_pos); | ||
} | ||
} | ||
} | ||
Some(AudioMessageUIAction::Stop(new_id)) => { | ||
let mut selected_mg = self.selected.lock().unwrap(); | ||
match selected_mg.clone() { | ||
Selected::Playing(current_id, _current_pos) | Selected::Paused(current_id, _current_pos) => { | ||
restore_audio_play_status(new_id, WAV_HEADER_SIZE); | ||
if ¤t_id == new_id { | ||
*selected_mg = Selected::None; | ||
} | ||
} | ||
_ => { } | ||
} | ||
} | ||
_ => { } | ||
} | ||
} | ||
} | ||
} | ||
|
||
impl AudioController { | ||
fn switch_to_audio(&self, new_id: &TimelineEventItemId) { | ||
if let Some((audio, new_pos, new_play_status)) = AUDIO_SET.read().unwrap().get(new_id) { | ||
*self.audio.lock().unwrap() = audio.clone(); | ||
*new_play_status.lock().unwrap() = true; | ||
*self.selected.lock().unwrap() = Selected::Playing(new_id.clone(), *new_pos.lock().unwrap()); | ||
} | ||
} | ||
} | ||
|
||
fn restore_audio_play_status(current_id: &TimelineEventItemId, current_pos: usize) { | ||
if let Some((_, old_pos, old_play_status)) = AUDIO_SET.read().unwrap().get(current_id) { | ||
*old_play_status.lock().unwrap() = false; | ||
*old_pos.lock().unwrap() = current_pos; | ||
} | ||
} | ||
|
||
pub fn insert_new_audio_or_get(timeline_audio_event_item_id: &TimelineEventItemId, data: Arc<[u8]>, channels: u16, bit_depth: u16) -> (Audio, Arc<Mutex<usize>>, Arc<Mutex<bool>>) { | ||
match AUDIO_SET.write().unwrap().entry(timeline_audio_event_item_id.clone()) { | ||
Entry::Vacant(v) => { | ||
let audio = Audio { | ||
data, | ||
channels, | ||
bit_depth | ||
}; | ||
let pos = Arc::new(Mutex::new(WAV_HEADER_SIZE)); | ||
let is_playing = Arc::new(Mutex::new(false)); | ||
v.insert((audio, pos, is_playing)).clone() | ||
} | ||
Entry::Occupied(o) => { | ||
o.get().clone() | ||
} | ||
} | ||
} | ||
|
||
|
||
pub fn parse_wav(data: &[u8]) -> Option<(u16, u16)> { | ||
// Check that the data length is sufficient, at least WAV_HEADER_SIZE bytes are required (standard WAV file header size) | ||
if data.len() < WAV_HEADER_SIZE { | ||
log!("Insufficient data length"); | ||
return None; | ||
} | ||
|
||
// Check if bytes 12-15 are 'fmt'. | ||
if &data[12..16] != b"fmt " { | ||
log!("`fmt` block not found"); | ||
return None; | ||
} | ||
|
||
// Read the size of the fmt block (bytes 16-19) | ||
let fmt_size = u32::from_le_bytes([data[16], data[17], data[18], data[19]]); | ||
if fmt_size < 16 { | ||
log!("`fmt` block size too small"); | ||
return None; | ||
} | ||
|
||
// Read the audio format (bytes 20-21) and make sure it's PCM (value 1) | ||
let audio_format = u16::from_le_bytes([data[20], data[21]]); | ||
if audio_format != 1 { | ||
log!("Not a `PCM` file"); | ||
return None; | ||
} | ||
|
||
// Extract the number of channels (bytes 22-23) | ||
let channels = u16::from_le_bytes([data[22], data[23]]); | ||
|
||
// Extract sampling rate (bytes 24-27) | ||
// let sample_rate = u32::from_le_bytes([data[24], data[25], data[26], data[27]]); | ||
|
||
// Extract bit depth (bytes 34-35) | ||
let bit_depth = u16::from_le_bytes([data[34], data[35]]); | ||
|
||
// Return the parsing result | ||
// Some((channels, sample_rate, bits_per_sample)) | ||
Some((channels, bit_depth)) | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[nitpick] Consider extracting the calculation 'pos + audio.bit_depth.ilog2()' into a well-named variable and add a clarifying comment to explain its relation to the sample boundary check.
Copilot uses AI. Check for mistakes.