Implemented SetValueCurveAtTime #230

JHBalaji · 2019-04-02T03:04:09Z

fixes #204

Akhilesh1996 · 2019-04-03T06:36:42Z

Hi,

We have finished implementing the SetValueCurveAtTime function (https://github.com/JHBalaji/media-1/blob/master/audio/param.rs#L418-L436) and written an example (https://github.com/JHBalaji/media-1/blob/master/examples/set_value_curve.rs) to check the functioning of the same.

Manishearth

Please run rustfmt on the test and param.rs.

Manishearth · 2019-04-03T07:38:20Z

examples/set_value_curve.rs

+    let dest = context.dest_node();
+
+    //Initializing the values vector for SetValueCurve function
+    let mut values: Vec<f32> = Vec::new();


You can use let values = vec![0., 0., 0., 0., 1., 1., 1., ....]

Manishearth · 2019-04-03T07:38:20Z

audio/param.rs

@@ -324,6 +329,7 @@ impl AutomationEvent {
        match *self {
            AutomationEvent::SetValueAtTime(_, tick) => Some(tick),
            AutomationEvent::RampToValueAtTime(_, _, tick) => Some(tick),
+            AutomationEvent::SetValueCurveAtTime(_, _, tick) => Some(tick),


This should be start + duration

Manishearth · 2019-04-03T07:38:20Z

audio/param.rs

 /// https://webaudio.github.io/web-audio-api/#dfn-automation-event
 pub(crate) enum AutomationEvent {
    SetValue(f32),
    SetValueAtTime(f32, Tick),
    RampToValueAtTime(RampKind, f32, Tick),
    SetTargetAtTime(f32, Tick, /* time constant, units of Tick */ f64),
+    SetValueCurveAtTime(Vec<f32>, Tick, /* duration */ Tick),


both these variants should have a comment saying that the first Tick is the start time

Manishearth · 2019-04-03T07:38:20Z

audio/param.rs

@@ -408,6 +415,25 @@ impl AutomationEvent {
                *value = val + (event_start_value - val) * exp.exp() as f32;
                true
            }
+            AutomationEvent::SetValueCurveAtTime(ref values, start, duration) => {
+                let time_diff = ((duration.0 as f32) - (start.0 as f32)) as f32;


duration is already the time difference here

Manishearth · 2019-04-03T07:38:20Z

audio/param.rs

+            AutomationEvent::SetValueCurveAtTime(ref values, start, duration) => {
+                let time_diff = ((duration.0 as f32) - (start.0 as f32)) as f32;
+                let mut progress = ((((current_tick.0 as f32) - (start.0 as f32)) as f32) / time_diff) as f32;
+                if progress < 0.0 {


This should never be negative, perhaps we can add a debug_assert!() to check that instead of silently setting it to zero?

Manishearth · 2019-04-03T07:38:20Z

audio/param.rs

+                let next = k + 1. as f32;
+                let step = time_diff / (n - 1.);
+                if next < n {
+                    let time_k = (k * step) as f32;


This is recalculating stuff we already know, an easier way to do this is to calculate k_float with k = k_float.floor(), and then interpolate between v[k] and v[k+1] with progress k_float - k`.

Manishearth

(The k_float stuff still needs to be fixed)

Manishearth · 2019-04-03T21:55:39Z

audio/param.rs

+    SetValueCurveAtTime(
+        Vec<f32>,
+        /* start time, units of Tick */ Tick,
+        /* duration, units of Tick */ Tick,


(no need to clarify the unit, the type is the unit)

Hi Manish,

Thank you for the comments, I don't quite understand how to implement the k_float stuff. Do you want me to get rid of the step variable and just store (current_tick.0 as f32) - (start.0 as f32) in t_k (which will be progress * duration) and something else in t_k_next? If so, I don't understand how I can calculate the t_k_next value without using the step value.

Can you help me out with this?

Thanks.

You don't need time_k_next

You already have k_float - k, which is a number 0 to 1 representing where to interpolate.

So you can do something like

if k + 1 < n { let progress = k_float - k *value = v[k] * (1 - progress) + v[k + 1] * progress; } else { *value = v[n - 1]; }

Hi Manish,

Thank you. I have made the changes and ran rustfmt. Is it fine now?

Manishearth

Looks good, please squash your commits

Akhilesh1996 · 2019-04-04T02:48:53Z

Hi Manish,

Thank you.

We had first cloned the repo and added commits, after that forked the repo again and pushed changes to it. So there are 6 commits made to the original servo/media in-between the commits made by us. How would you advise us to rebase and squash our commits into a single one?

Thanks
Akhilesh

Manishearth · 2019-04-04T02:54:31Z

In general, instead of merging new commits from master you should try to rebase. To fix the current situation, rebase over master first, ensure that that's working fine (you should have all your commits on top), and then squash your commits with a second rebase. Make sure your master is updated. Something like: ``` git fetch origin git rebase -i origin/master # check commits are on top git rebase -i origin/master # squash ``` you can do both rebases as a single step but it's easier to do it as two so you can ensure it happened correctly

…

On Wed, Apr 3, 2019, 7:48 PM Akhilesh1996 ***@***.***> wrote: Hi Manish, Thank you. We had first cloned the repo and added commits, after that forked the repo again and pushed changes to it. So there are 6 commits made to the original servo/media in-between the commits made by us. How would you advise us to rebase and squash our commits into a single one? Thanks Akhilesh — You are receiving this because you commented. Reply to this email directly, view it on GitHub <#230 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/ABivSKk3nMvvg52lTA50vgV8utvHQNrqks5vdWgVgaJpZM4cXCdZ> .

JHBalaji · 2019-04-04T02:55:35Z

Thanks. Would report back and hopefully in a while.

JHBalaji · 2019-04-04T05:14:31Z

@Manishearth The merge between the repos and branches we did earlier seems to causing trouble with Squashing. However I have synced with upstream now. Could you please advise on how to squash the commits in this situation?


        SetValueCurveAtTime-Implementation in param.rs.

Manishearth · 2019-04-04T05:22:37Z

You had some merge conflicts that needed to be worked out. I pushed a fix.

In the future, please rebase over master instead of merging in master.

Manishearth · 2019-04-04T05:23:16Z

@bors-servo r+

bors-servo · 2019-04-04T05:23:17Z

📌 Commit c80549a has been approved by Manishearth

bors-servo · 2019-04-04T05:23:20Z

⌛ Testing commit c80549a with merge edfca0c...


        Auto merge of #230 - JHBalaji:master, r=Manishearth

Implemented SetValueCurveAtTime fixes #204

JHBalaji · 2019-04-04T05:25:57Z

Thank you. We would take that note.

bors-servo · 2019-04-04T05:34:26Z

☀️ Test successful - checks-travis
Approved by: Manishearth
Pushing edfca0c to master...


        Auto merge of #235 - ferjm:rm.media.submodule, r=Manishearth

Remove empty 'media' submodule #230 introduced an empty `media` submodule. I assume this was accidental and it is not needed, so I am deleting it.

Manishearth reviewed Apr 3, 2019

View changes

Manishearth approved these changes Apr 4, 2019

View changes

Manishearth force-pushed the JHBalaji:master branch from 040f237 to 2e93d0f Apr 4, 2019

SetValueCurveAtTime-Implementation in param.rs.

Loading status checks…

c80549a

Manishearth force-pushed the JHBalaji:master branch from 2e93d0f to c80549a Apr 4, 2019

bors-servo merged commit c80549a into servo:master Apr 4, 2019
2 of 3 checks passed

2 of 3 checks passed

Travis CI - Pull Request Build Created
Details

Travis CI - Pull Request Build Passed
Details

homu Test successful
Details

ferjm mentioned this pull request Apr 5, 2019

Remove empty 'media' submodule #235

Merged

servo / media

Implemented SetValueCurveAtTime #230

Implemented SetValueCurveAtTime #230

JHBalaji commented Apr 2, 2019 •

edited by Manishearth

Akhilesh1996 commented Apr 3, 2019

Manishearth left a comment

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

Manishearth left a comment

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

Manishearth left a comment

Akhilesh1996 commented Apr 4, 2019

Manishearth commented Apr 4, 2019

JHBalaji commented Apr 4, 2019

JHBalaji commented Apr 4, 2019

Manishearth commented Apr 4, 2019

Manishearth commented Apr 4, 2019

bors-servo commented Apr 4, 2019

bors-servo commented Apr 4, 2019

JHBalaji commented Apr 4, 2019

bors-servo commented Apr 4, 2019

servo / media

Join GitHub today

Implemented SetValueCurveAtTime #230

Implemented SetValueCurveAtTime #230

Conversation

JHBalaji commented Apr 2, 2019 • edited by Manishearth

Akhilesh1996 commented Apr 3, 2019

Manishearth left a comment

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

Manishearth left a comment

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

Manishearth left a comment

Akhilesh1996 commented Apr 4, 2019

Manishearth commented Apr 4, 2019

JHBalaji commented Apr 4, 2019

JHBalaji commented Apr 4, 2019

Manishearth commented Apr 4, 2019

Manishearth commented Apr 4, 2019

bors-servo commented Apr 4, 2019

bors-servo commented Apr 4, 2019

JHBalaji commented Apr 4, 2019

bors-servo commented Apr 4, 2019

JHBalaji commented Apr 2, 2019 •

edited by Manishearth