Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-20 00:35:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1522305 - Make MediaRecorder timeslice parameter unsigned. r=jib,smaug

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D17815

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Andreas Pehrson 2019-06-13 08:40:42 +00:00
parent 06b2401540
commit 099e60b97b
3 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dom/media/MediaRecorder.cpp
View File

@ -467,7 +467,7 @@ class MediaRecorder::Session : public PrincipalChangeObserver<MediaStreamTrack>,
friend class DestroyRunnable;
public:
Session(MediaRecorder* aRecorder, int32_t aTimeSlice)
Session(MediaRecorder* aRecorder, uint32_t aTimeSlice)
: mRecorder(aRecorder),
mMediaStreamReady(false),
mTimeSlice(aTimeSlice),
@ -1223,10 +1223,8 @@ class MediaRecorder::Session : public PrincipalChangeObserver<MediaStreamTrack>,
// Timestamp of the last fired dataavailable event.
TimeStamp mLastBlobTimeStamp;
// The interval of passing encoded data from MutableBlobStorage to
// onDataAvailable handler. "mTimeSlice < 0" means Session object does not
// push encoded data to onDataAvailable, instead, it passive wait the client
// side pull encoded data by calling requestData API.
const int32_t mTimeSlice;
// onDataAvailable handler.
const uint32_t mTimeSlice;
// The session's current main thread state. The error type gets setwhen ending
// a recording with an error. An NS_OK error is invalid.
// Main thread only.
@ -1292,7 +1290,7 @@ void MediaRecorder::SetMimeType(const nsString& aMimeType) {
void MediaRecorder::GetMimeType(nsString& aMimeType) { aMimeType = mMimeType; }
void MediaRecorder::Start(const Optional<int32_t>& aTimeSlice,
void MediaRecorder::Start(const Optional<uint32_t>& aTimeSlice,
ErrorResult& aResult) {
LOG(LogLevel::Debug, ("MediaRecorder.Start %p", this));
@ -1322,15 +1320,7 @@ void MediaRecorder::Start(const Optional<int32_t>& aTimeSlice,
}
}
int32_t timeSlice = 0;
if (aTimeSlice.WasPassed()) {
if (aTimeSlice.Value() < 0) {
aResult.Throw(NS_ERROR_INVALID_ARG);
return;
}
timeSlice = aTimeSlice.Value();
}
uint32_t timeSlice = aTimeSlice.WasPassed() ? aTimeSlice.Value() : 0;
MediaRecorderReporter::AddMediaRecorder(this);
mState = RecordingState::Recording;
// Start a session.

2
dom/media/MediaRecorder.h
View File

@ -71,7 +71,7 @@ class MediaRecorder final : public DOMEventTargetHelper,
// raise a dataavailable event containing the Blob of collected data on every
// timeSlice milliseconds. If timeSlice isn't provided, UA should call the
// RequestData to obtain the Blob data, also set the mTimeSlice to zero.
void Start(const Optional<int32_t>& timeSlice, ErrorResult& aResult);
void Start(const Optional<uint32_t>& timeSlice, ErrorResult& aResult);
// Stop the recording activiy. Including stop the Media Encoder thread,
// un-hook the mediaStreamListener to encoder.
void Stop(ErrorResult& aResult);

2
dom/webidl/MediaRecorder.webidl
View File

@ -38,7 +38,7 @@ interface MediaRecorder : EventTarget {
attribute EventHandler onwarning;
[Throws]
void start(optional long timeSlice);
void start(optional unsigned long timeslice);
[Throws]
void stop();