Skip to content

/ media

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

Allow simultaneous playback of audio and video streams #260

Merged
merged 5 commits into from May 28, 2019
Merged

Allow simultaneous playback of audio and video streams #260

merged 5 commits into from May 28, 2019
+247 −102

Conversation

@ferjm
Copy link
Member

ferjm commented May 10, 2019

No description provided.

@ferjm
ferjm reviewed May 10, 2019
View changes
backends/gstreamer/media_stream_source.rs Outdated Show resolved Hide resolved
@Manishearth
Copy link
Member

Manishearth commented May 10, 2019

How does setting multiple streams on this work? (or is that not implemented yet?) It seems like set_stream still gets called just once?
@ferjm
Copy link
Member Author

ferjm commented May 17, 2019

set_stream is called once per MediaStreamTrack in Servo https://github.com/servo/servo/blob/master/components/script/dom/htmlmediaelement.rs#L842
@ferjm ferjm force-pushed the ferjm:multi.streams.src branch 2 times, most recently from ed4d67c to fd0bdf3 May 21, 2019
@sdroege
sdroege reviewed May 24, 2019
View changes
backends/gstreamer/media_stream_source.rs Outdated Show resolved Hide resolved
@sdroege
sdroege reviewed May 24, 2019
View changes
backends/gstreamer/media_stream_source.rs Outdated Show resolved Hide resolved
@ferjm ferjm force-pushed the ferjm:multi.streams.src branch from 426887a to bd81c7f May 24, 2019
@ferjm ferjm changed the title [WIP] Allow simultaneous playback of audio and video streams Allow simultaneous playback of audio and video streams May 24, 2019
@ferjm
Copy link
Member Author

ferjm commented May 24, 2019

r? @sdroege @ceyusa @Manishearth
@ferjm
Copy link
Member Author

ferjm commented May 24, 2019

The meat of these patches is on the backends/gstreamer/media_stream_source.rs file. The rest is the addition of the only_stream flag to set_stream and rustfmt.
@ceyusa
ceyusa reviewed May 27, 2019
View changes
backends/gstreamer/media_stream_source.rs Outdated Show resolved Hide resolved
backends/gstreamer/media_stream_source.rs Outdated Show resolved Hide resolved
backends/gstreamer/media_stream_source.rs Outdated Show resolved Hide resolved
@bors-servo
Copy link
Contributor

bors-servo commented May 28, 2019

☔ The latest upstream changes (presumably #266) made this pull request unmergeable. Please resolve the merge conflicts.
ferjm added 5 commits May 10, 2019
@ferjm
Initial work to allow simultaneous playback of audio and video streams
504d13c
@ferjm
Move from always to sometimes pads for audio and video src pads
3713593
@ferjm
Correct pad names and flag when we expect no more pads
62b3948
@ferjm
Use same caps for GStreamerMediaStream and ServoMediaStreamSource
5219989
@ferjm
Clarify limitations of the current design (one stream per type)
Loading status checks…
3df90cf
@ferjm ferjm force-pushed the ferjm:multi.streams.src branch from 620bd26 to 3df90cf May 28, 2019
@ceyusa
Copy link
Contributor

ceyusa commented May 28, 2019

@bors-servo r+
@bors-servo
Copy link
Contributor

bors-servo commented May 28, 2019

📌 Commit 3df90cf has been approved by ceyusa
@bors-servo
Copy link
Contributor

bors-servo commented May 28, 2019

⌛ Testing commit 3df90cf with merge 2dabf1a...
bors-servo added a commit that referenced this pull request May 28, 2019
@bors-servo
Auto merge of #260 - ferjm:multi.streams.src, r=ceyusa
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
2dabf1a 
Allow simultaneous playback of audio and video streams
@bors-servo
Copy link
Contributor

bors-servo commented May 28, 2019

☀️ Test successful - checks-travis
Approved by: ceyusa
Pushing 2dabf1a to master...
@bors-servo bors-servo merged commit 3df90cf into servo:master May 28, 2019
2 checks passed
2 checks passed
Travis CI - Pull Request Build Passed
Details
homu Test successful
Details
@ferjm ferjm deleted the ferjm:multi.streams.src branch May 28, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ceyusa ceyusa

@sdroege sdroege

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
@ferjm @Manishearth @bors-servo @ceyusa @sdroege
You can’t perform that action at this time.