Bug 1262808: Fix use of |PrincipleHandle| in |MediaEngineGonkVideoSource| r=rjesup

This commit is contained in:
Thomas Zimmermann 2016-04-12 16:54:43 +02:00
Родитель d08ecacecf
Коммит 448805f444
2 изменённых файлов: 8 добавлений и 5 удалений

Просмотреть файл

@ -68,7 +68,7 @@ MediaEngineGonkVideoSource::NotifyPull(MediaStreamGraph* aGraph,
SourceMediaStream* aSource,
TrackID aID,
StreamTime aDesiredTime,
const PrincipalID& aPrincipalHandle)
const PrincipalHandle& aPrincipalHandle)
{
VideoSegment segment;
@ -99,7 +99,7 @@ MediaEngineGonkVideoSource::NotifyPull(MediaStreamGraph* aGraph,
segment.AppendFrame(image.forget(), delta, size, aPrincipalHandle);
// This can fail if either a) we haven't added the track yet, or b)
// we've removed or finished the track.
aSource->AppendToTrack(aID, &(segment), aPrincipalHandle);
aSource->AppendToTrack(aID, &(segment));
}
}
@ -203,7 +203,8 @@ MediaEngineGonkVideoSource::Deallocate()
}
nsresult
MediaEngineGonkVideoSource::Start(SourceMediaStream* aStream, TrackID aID)
MediaEngineGonkVideoSource::Start(SourceMediaStream* aStream, TrackID aID,
const PrincipalHandle& aPrincipalHandle)
{
LOG((__FUNCTION__));
if (!mInitDone || !aStream) {

Просмотреть файл

@ -65,7 +65,8 @@ public:
const nsString& aDeviceId,
const nsACString& aOrigin) override;
nsresult Deallocate() override;
nsresult Start(SourceMediaStream* aStream, TrackID aID) override;
nsresult Start(SourceMediaStream* aStream, TrackID aID,
const PrincipalHandle& aPrincipalHandle) override;
nsresult Stop(SourceMediaStream* aSource, TrackID aID) override;
nsresult Restart(const dom::MediaTrackConstraints& aConstraints,
const MediaEnginePrefs &aPrefs,
@ -73,7 +74,8 @@ public:
void NotifyPull(MediaStreamGraph* aGraph,
SourceMediaStream* aSource,
TrackID aId,
StreamTime aDesiredTime) override;
StreamTime aDesiredTime,
const PrincipalHandle& aPrincipalHandle) override;
dom::MediaSourceEnum GetMediaSource() const override {
return dom::MediaSourceEnum::Camera;
}