corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1153049: Part1. Merge MediaInfo and mp4_demuxer::TrackConfig. r=cpearce

Browse Source
This commit is contained in:
Jean-Yves Avenard
2015-04-14 15:15:46 +10:00
parent 53ce854702
commit 84b9d11448
5 changed files with 149 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
dom/html/HTMLMediaElement.cpp
View File

@@ -1892,11 +1892,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);
}
}
@@ -3196,11 +3196,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);
}
}