-
Notifications
You must be signed in to change notification settings - Fork 41
Display audio messages. #396
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
emmettlu
wants to merge
37
commits into
project-robius:main
Choose a base branch
from
emmettlu:fix120
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.
+643
−22
Draft
Changes from all commits
Commits
Show all changes
37 commits
Select commit
Hold shift + click to select a range
e530f81
Remove dont support audio prompt
emmettlu 3c26329
Remove TODO prompt & add basic
emmettlu 6f1704a
Add svg file 'download'
emmettlu 7fffb21
Add audio player base
emmettlu 7402dd4
Change message in timeline
emmettlu acc3c36
Finished Audio view base
emmettlu 9e632c0
audio playing issues
emmettlu 38c6cec
Every audio player possess a sink
emmettlu d973965
Finished pause functionality
emmettlu ab559ed
Merge branch 'main' into fix120
emmettlu 39b1fd9
Resolve conflicts
emmettlu 1bc325e
Merge branch 'main' into fix120
emmettlu 7540d59
Change audio button color
emmettlu d63ac99
Replace field 'inisialized' with func 'after_new_from_doc'
emmettlu e5fa09a
Optimize button UI
emmettlu cfc158c
Merge branch 'main' into fix120
emmettlu 07c5199
Update 'Cargo.lock'
emmettlu 9364026
Merge branch 'main' into fix120
emmettlu 47a92aa
Audio player base
emmettlu 550b6c9
Audio Player base
emmettlu fc6a0ba
Play Noise
emmettlu 0504c86
All audios use one sink
emmettlu a290732
Merge branch 'main' into fix120
emmettlu e381073
Complish audio player base
emmettlu 0200e67
Remove '.log' file
emmettlu fe3062a
Fix media cache fecthing failed
emmettlu ea1b4d4
Add fetching prompt for audio message
emmettlu e3b6a8a
Refactor audio module
emmettlu 48dd0a6
Correct audio position
emmettlu 82744ab
Remove redadant svg files
emmettlu d4f4565
Update src/home/room_screen.rs
emmettlu c5f7f96
Update src/audio/audio_controller.rs
emmettlu f1177b6
Fix copilot review errors
emmettlu f57eac1
revert 'Cargo.lock' to main
emmettlu 5c679e5
Remove play & pause icon const
emmettlu 979f36a
Fix doc
emmettlu dd1c3ba
Restore audio message ui status when being dropped
emmettlu 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,306 @@ | ||
| //! 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; | ||
|
|
||
| type Audios = HashMap<TimelineEventItemId, (Audio, Arc<Mutex<usize>>, Arc<Mutex<bool>>)>; | ||
|
|
||
| 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 Drop for AudioController { | ||
| fn drop(&mut self) { | ||
| // todo!() | ||
| } | ||
| } | ||
|
|
||
| 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(); | ||
| match (audio.channels, audio.bit_depth) { | ||
| (2, 16) => { | ||
| // stereo 16bit | ||
| output_buffer.zero(); | ||
| let (left, right) = output_buffer.stereo_mut(); | ||
| let mut i = 0; | ||
| while i < left.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; | ||
| i += 1; | ||
| *selected_mg = Selected::Playing(id.clone(), pos); | ||
| } | ||
| } | ||
| (2, 24) => { | ||
| // stereo 24bit | ||
| output_buffer.zero(); | ||
| let (left, right) = output_buffer.stereo_mut(); | ||
| let mut i = 0; | ||
| while i < left.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; | ||
| i += 1; | ||
| *selected_mg = Selected::Playing(id.clone(), pos); | ||
| } | ||
| } | ||
| (2, 32) => { | ||
| // stereo 24bit | ||
| output_buffer.zero(); | ||
| let (left, right) = output_buffer.stereo_mut(); | ||
| let mut i = 0; | ||
| while i < left.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; | ||
| i += 1; | ||
| *selected_mg = Selected::Playing(id.clone(), pos); | ||
| } | ||
| } | ||
| _ => { } | ||
| } | ||
| if pos > audio.data.len() { | ||
| *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.clone().lock().unwrap().clone(); | ||
| match selected { | ||
| Selected::Playing(current_id, current_pos) => { | ||
| if current_id != new_id.clone() { | ||
| cx.action(AudioControllerAction::UiToPause(current_id.clone())); | ||
| if let Some((_audio, old_pos, old_playing_status)) = AUDIO_SET.read().unwrap().get(¤t_id) { | ||
| *old_pos.lock().unwrap() = current_pos; | ||
| *old_playing_status.lock().unwrap() = false; | ||
| } | ||
| if let Some((audio, new_pos, new_playing_status)) = AUDIO_SET.read().unwrap().get(new_id) { | ||
| *self.audio.lock().unwrap() = audio.clone(); | ||
| let new_pos_mg = new_pos.lock().unwrap(); | ||
| *new_playing_status.lock().unwrap() = true; | ||
| *self.selected.lock().unwrap() = Selected::Playing(new_id.clone(), *new_pos_mg); | ||
| } | ||
| } | ||
| } | ||
| Selected::Paused(current_id, current_pos) => { | ||
| if ¤t_id == new_id { | ||
| *self.selected.lock().unwrap() = Selected::Playing(new_id.clone(), current_pos); | ||
| } else { | ||
| if let Some((_audio, old_pos, old_playing_status)) = AUDIO_SET.read().unwrap().get(¤t_id) { | ||
| *old_playing_status.lock().unwrap() = false; | ||
| *old_pos.lock().unwrap() = current_pos; | ||
| } | ||
|
|
||
| if let Some((audio, new_pos, new_playing_status)) = AUDIO_SET.read().unwrap().get(new_id) { | ||
| *self.audio.lock().unwrap() = audio.clone(); | ||
| let new_pos = *new_pos.lock().unwrap(); | ||
| *new_playing_status.lock().unwrap() = true; | ||
| *self.selected.lock().unwrap() = Selected::Playing(new_id.clone(), new_pos); | ||
| } | ||
| } | ||
| } | ||
| Selected::None => { | ||
| if let Some((audio, _new_pos, new_playing_status)) = AUDIO_SET.read().unwrap().get(new_id) { | ||
| *new_playing_status.lock().unwrap() = true; | ||
| *self.audio.lock().unwrap() = audio.clone(); | ||
| *self.selected.lock().unwrap() = Selected::Playing(new_id.clone(), 44); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| Some(AudioMessageUIAction::Pause(new_id)) => { | ||
| let selected =self.selected.clone().lock().unwrap().clone(); | ||
| if let Selected::Playing(current_id, current_pos) = selected { | ||
| if ¤t_id == new_id { | ||
| if let Some((_audio, old_pos, old_playing_status)) = AUDIO_SET.write().unwrap().get(¤t_id) { | ||
| *old_playing_status.lock().unwrap() = false; | ||
| *old_pos.lock().unwrap() = current_pos; | ||
| } | ||
| *self.selected.lock().unwrap() = Selected::Paused(new_id.clone(), current_pos); | ||
| } | ||
| } | ||
| } | ||
| Some(AudioMessageUIAction::Stop(new_id)) => { | ||
| let selected =self.selected.clone().lock().unwrap().clone(); | ||
| match selected { | ||
| Selected::Playing(current_id, _current_pos) => { | ||
| if ¤t_id == new_id { | ||
| if let Some((_audio, old_pos, old_playing_status)) = AUDIO_SET.write().unwrap().get(¤t_id) { | ||
| *old_playing_status.lock().unwrap() = false; | ||
| *old_pos.lock().unwrap() = 44; | ||
| } | ||
| *self.selected.lock().unwrap() = Selected::None; | ||
| } | ||
| } | ||
| Selected::Paused(current_id, _current_pos) => { | ||
| if ¤t_id == new_id { | ||
| if let Some((_audio, old_pos, old_playing_status)) = AUDIO_SET.write().unwrap().get(¤t_id) { | ||
| *old_playing_status.lock().unwrap() = false; | ||
| *old_pos.lock().unwrap() = 44; | ||
| } | ||
| *self.selected.lock().unwrap() = Selected::None; | ||
| } | ||
| } | ||
| _ => { } | ||
| } | ||
| } | ||
| _ => { } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| 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(44)); | ||
| 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 44 bytes are required (standard WAV file header size) | ||
| if data.len() < 44 { | ||
| log!("Insufficient data length"); | ||
| return None; | ||
| } | ||
|
|
||
| // Check if the first 4 bytes are 'RIFF'. | ||
| if &data[0..4] != b"RIFF" { | ||
| log!("Not a `RIFF` file"); | ||
| return None; | ||
| } | ||
|
|
||
| // Check if bytes 8-11 are 'WAVE'. | ||
| if &data[8..12] != b"WAVE" { | ||
| log!("Not a `WAVE` file"); | ||
| 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.
Uh oh!
There was an error while loading. Please reload this page.