Skip to content
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

Conversation

@ferjm
Copy link
Member

@ferjm ferjm commented May 10, 2019

No description provided.

@Manishearth
Copy link
Member

@Manishearth 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 ferjm commented May 17, 2019

@ferjm ferjm force-pushed the multi.streams.src branch 2 times, most recently from ed4d67c to fd0bdf3 May 22, 2019
@ferjm ferjm force-pushed the 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 ferjm commented May 24, 2019

@ferjm
Copy link
Member Author

@ferjm 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.

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 bors-servo commented May 28, 2019

The latest upstream changes (presumably #266) made this pull request unmergeable. Please resolve the merge conflicts.

@ferjm ferjm force-pushed the multi.streams.src branch from 620bd26 to 3df90cf May 28, 2019
@ceyusa
Copy link
Contributor

@ceyusa ceyusa commented May 28, 2019

@bors-servo
Copy link
Contributor

@bors-servo bors-servo commented May 28, 2019

📌 Commit 3df90cf has been approved by ceyusa

@bors-servo
Copy link
Contributor

@bors-servo bors-servo commented May 28, 2019

Testing commit 3df90cf with merge 2dabf1a...

bors-servo added a commit that referenced this issue May 28, 2019
Allow simultaneous playback of audio and video streams
@bors-servo
Copy link
Contributor

@bors-servo 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
@ferjm ferjm deleted the 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
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants