Bug 1283394. Part 1 - rename some functions. r=kaku
MozReview-Commit-ID: IrdaLYk1hwX
--- a/dom/media/NextFrameSeekTask.cpp
+++ b/dom/media/NextFrameSeekTask.cpp
@@ -53,17 +53,17 @@ NextFrameSeekTask::NextFrameSeekTask(con
, mHasAudio(aInfo.HasAudio())
, mHasVideo(aInfo.HasVideo())
, mDuration(aDuration)
{
AssertOwnerThread();
MOZ_ASSERT(HasVideo());
// Configure MediaDecoderReaderWrapper.
- SetMediaDecoderReaderWrapperCallback();
+ SetCallbacks();
}
NextFrameSeekTask::~NextFrameSeekTask()
{
AssertOwnerThread();
MOZ_ASSERT(mIsDiscarded);
}
@@ -88,17 +88,17 @@ NextFrameSeekTask::Discard()
// Disconnect MediaDecoder.
mSeekJob.RejectIfExists(__func__);
// Disconnect MDSM.
RejectIfExist(__func__);
// Disconnect MediaDecoderReader.
- CancelMediaDecoderReaderWrapperCallback();
+ CancelCallbacks();
mIsDiscarded = true;
}
bool
NextFrameSeekTask::NeedToResetMDSM() const
{
AssertOwnerThread();
@@ -406,17 +406,17 @@ NextFrameSeekTask::OnVideoNotDecoded(Med
if (aReason == MediaDecoderReader::END_OF_STREAM) {
mIsVideoQueueFinished = true;
CheckIfSeekComplete();
}
}
void
-NextFrameSeekTask::SetMediaDecoderReaderWrapperCallback()
+NextFrameSeekTask::SetCallbacks()
{
AssertOwnerThread();
// Register dummy callbcak for audio decoding since we don't need to handle
// the decoded audio samples.
mAudioCallback = mReader->AudioCallback().Connect(
OwnerThread(), [this] (AudioCallbackData aData) {
if (aData.is<MediaData*>()) {
@@ -446,17 +446,17 @@ NextFrameSeekTask::SetMediaDecoderReader
OwnerThread(), [this] (WaitCallbackData aData) {
if (aData.is<MediaData::Type>()) {
EnsureVideoDecodeTaskQueued();
}
});
}
void
-NextFrameSeekTask::CancelMediaDecoderReaderWrapperCallback()
+NextFrameSeekTask::CancelCallbacks()
{
AssertOwnerThread();
mAudioCallback.Disconnect();
mVideoCallback.Disconnect();
mAudioWaitCallback.Disconnect();
mVideoWaitCallback.Disconnect();
}
--- a/dom/media/NextFrameSeekTask.h
+++ b/dom/media/NextFrameSeekTask.h
@@ -64,19 +64,19 @@ private:
void OnAudioDecoded(MediaData* aAudioSample);
void OnAudioNotDecoded(MediaDecoderReader::NotDecodedReason aReason);
void OnVideoDecoded(MediaData* aVideoSample);
void OnVideoNotDecoded(MediaDecoderReader::NotDecodedReason aReason);
- void SetMediaDecoderReaderWrapperCallback();
+ void SetCallbacks();
- void CancelMediaDecoderReaderWrapperCallback();
+ void CancelCallbacks();
// Update the seek target's time before resolving this seek task, the updated
// time will be used in the MDSM::SeekCompleted() to update the MDSM's position.
void UpdateSeekTargetTime();
/*
* Data shared with MDSM.
*/