KotJohansson/palemoon27
1
0
Fork 0
mirror of https://github.com/roytam1/palemoon27.git synced 2026-05-26 14:30:27 +00:00
Code Issues Projects Releases Wiki Activity

Combine MediaInfo and mp4_demuxer::TrackConfig

Browse Source
This commit is contained in:
trav90
2016-10-21 03:39:57 -05:00
committed by roytam1
parent 3fab966721
commit 7e5b4386f2
5 changed files with 149 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dom/html/HTMLMediaElement.cpp
+4 -4
View File
@@ -1874,11 +1874,11 @@ HTMLMediaElement::CaptureStreamInternal(bool aFinishWhenEnded)
if (mReadyState >= HAVE_METADATA) {
// Expose the tracks to JS directly.
if (HasAudio()) {
TrackID audioTrackId = mMediaInfo.mAudio.mTrackInfo.mOutputId;
TrackID audioTrackId = mMediaInfo.mAudio.mTrackId;
out->mStream->CreateDOMTrack(audioTrackId, MediaSegment::AUDIO);
}
if (HasVideo()) {
TrackID videoTrackId = mMediaInfo.mVideo.mTrackInfo.mOutputId;
TrackID videoTrackId = mMediaInfo.mVideo.mTrackId;
out->mStream->CreateDOMTrack(videoTrackId, MediaSegment::VIDEO);
}
}
@@ -3172,11 +3172,11 @@ void HTMLMediaElement::MetadataLoaded(const MediaInfo* aInfo,
// Expose the tracks to JS directly.
for (OutputMediaStream& out : mOutputStreams) {
if (aInfo->HasAudio()) {
TrackID audioTrackId = aInfo->mAudio.mTrackInfo.mOutputId;
TrackID audioTrackId = aInfo->mAudio.mTrackId;
out.mStream->CreateDOMTrack(audioTrackId, MediaSegment::AUDIO);
}
if (aInfo->HasVideo()) {
TrackID videoTrackId = aInfo->mVideo.mTrackInfo.mOutputId;
TrackID videoTrackId = aInfo->mVideo.mTrackId;
out.mStream->CreateDOMTrack(videoTrackId, MediaSegment::VIDEO);
}
}