mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-27 20:25:44 +00:00
Bug 1316211. P3 - remove unused members. r=gerald
MozReview-Commit-ID: 4cAHEvMEm9Q --HG-- extra : rebase_source : bc3d7decf46c5ea5b2b99d0df383875ea99dd035 extra : source : 02bba6d4539ae37085774c09f3ba6c1e3c55b61c
This commit is contained in:
parent
3e0b54aed5
commit
669cff3ca0
@ -69,15 +69,12 @@ public:
|
||||
};
|
||||
|
||||
MediaDecoderReader::MediaDecoderReader(MediaDecoderReaderInit& aInit)
|
||||
: mAudioCompactor(mAudioQueue)
|
||||
, mDecoder(aInit.mDecoder)
|
||||
: mDecoder(aInit.mDecoder)
|
||||
, mTaskQueue(new TaskQueue(
|
||||
GetMediaThreadPool(MediaThreadType::PLAYBACK),
|
||||
"MediaDecoderReader::mTaskQueue",
|
||||
/* aSupportsTailDispatch = */ true))
|
||||
, mBuffered(mTaskQueue, TimeIntervals(), "MediaDecoderReader::mBuffered (Canonical)")
|
||||
, mIgnoreAudioOutputFormat(false)
|
||||
, mHitAudioDecodeError(false)
|
||||
, mShutdown(false)
|
||||
, mResource(aInit.mResource)
|
||||
{
|
||||
@ -133,12 +130,10 @@ nsresult MediaDecoderReader::ResetDecode(TrackSet aTracks)
|
||||
{
|
||||
if (aTracks.contains(TrackInfo::kVideoTrack)) {
|
||||
VideoQueue().Reset();
|
||||
mBaseVideoPromise.RejectIfExists(NS_ERROR_DOM_MEDIA_CANCELED, __func__);
|
||||
}
|
||||
|
||||
if (aTracks.contains(TrackInfo::kAudioTrack)) {
|
||||
AudioQueue().Reset();
|
||||
mBaseAudioPromise.RejectIfExists(NS_ERROR_DOM_MEDIA_CANCELED, __func__);
|
||||
}
|
||||
|
||||
return NS_OK;
|
||||
@ -150,9 +145,6 @@ MediaDecoderReader::Shutdown()
|
||||
MOZ_ASSERT(OnTaskQueue());
|
||||
mShutdown = true;
|
||||
|
||||
mBaseAudioPromise.RejectIfExists(NS_ERROR_DOM_MEDIA_END_OF_STREAM, __func__);
|
||||
mBaseVideoPromise.RejectIfExists(NS_ERROR_DOM_MEDIA_END_OF_STREAM, __func__);
|
||||
|
||||
ReleaseResources();
|
||||
mBuffered.DisconnectAll();
|
||||
|
||||
|
@ -187,7 +187,6 @@ public:
|
||||
// available in the audio output.
|
||||
void SetIgnoreAudioOutputFormat()
|
||||
{
|
||||
mIgnoreAudioOutputFormat = true;
|
||||
}
|
||||
|
||||
// The MediaDecoderStateMachine uses various heuristics that assume that
|
||||
@ -298,12 +297,6 @@ protected:
|
||||
// the decoder, state machine, and main threads.
|
||||
MediaQueue<VideoData> mVideoQueue;
|
||||
|
||||
// An adapter to the audio queue which first copies data to buffers with
|
||||
// minimal allocation slop and then pushes them to the queue. This is
|
||||
// useful for decoders working with formats that give awkward numbers of
|
||||
// frames such as mp3.
|
||||
AudioCompactor mAudioCompactor;
|
||||
|
||||
// Reference to the owning decoder object.
|
||||
AbstractMediaDecoder* mDecoder;
|
||||
|
||||
@ -318,16 +311,6 @@ protected:
|
||||
|
||||
media::NullableTimeUnit mDuration;
|
||||
|
||||
// Whether we should accept media that we know we can't play
|
||||
// directly, because they have a number of channel higher than
|
||||
// what we support.
|
||||
bool mIgnoreAudioOutputFormat;
|
||||
|
||||
// This is a quick-and-dirty way for DecodeAudioData implementations to
|
||||
// communicate the presence of a decoding error to RequestAudioData. We should
|
||||
// replace this with a promise-y mechanism as we make this stuff properly
|
||||
// async.
|
||||
bool mHitAudioDecodeError;
|
||||
bool mShutdown;
|
||||
|
||||
// Used to send TimedMetadata to the listener.
|
||||
@ -349,11 +332,6 @@ protected:
|
||||
|
||||
private:
|
||||
virtual nsresult InitInternal() = 0;
|
||||
|
||||
// Promises used only for the base-class (sync->async adapter) implementation
|
||||
// of Request{Audio,Video}Data.
|
||||
MozPromiseHolder<AudioDataPromise> mBaseAudioPromise;
|
||||
MozPromiseHolder<VideoDataPromise> mBaseVideoPromise;
|
||||
};
|
||||
|
||||
} // namespace mozilla
|
||||
|
Loading…
Reference in New Issue
Block a user