Bug 1273947 - Update ResetDecode() to ResetDecode(TargetQueue) r?jya
MozReview-Commit-ID: A32znxwP5gb
--- a/dom/media/omx/MediaOmxReader.cpp
+++ b/dom/media/omx/MediaOmxReader.cpp
@@ -171,17 +171,17 @@ MediaOmxReader::Shutdown()
return p;
}
void MediaOmxReader::ReleaseMediaResources()
{
mMediaResourceRequest.DisconnectIfExists();
mMetadataPromise.RejectIfExists(ReadMetadataFailureReason::METADATA_ERROR, __func__);
- ResetDecode();
+ ResetDecode(AUDIO_VIDEO);
// Before freeing a video codec, all video buffers needed to be released
// even from graphics pipeline.
VideoFrameContainer* container = mDecoder->GetVideoFrameContainer();
if (container) {
container->ClearCurrentFrame();
}
if (mOmxDecoder.get()) {
mOmxDecoder->ReleaseMediaResources();
--- a/dom/media/omx/MediaOmxReader.h
+++ b/dom/media/omx/MediaOmxReader.h
@@ -69,21 +69,21 @@ protected:
public:
MediaOmxReader(AbstractMediaDecoder* aDecoder);
~MediaOmxReader();
protected:
void NotifyDataArrivedInternal() override;
public:
- nsresult ResetDecode() override
+ nsresult ResetDecode(TargetQueues aQueues) override
{
mSeekRequest.DisconnectIfExists();
mSeekPromise.RejectIfExists(NS_OK, __func__);
- return MediaDecoderReader::ResetDecode();
+ return MediaDecoderReader::ResetDecode(aQueues);
}
bool DecodeAudioData() override;
bool DecodeVideoFrame(bool &aKeyframeSkip, int64_t aTimeThreshold) override;
void ReleaseMediaResources() override;
RefPtr<MediaDecoderReader::MetadataPromise> AsyncReadMetadata() override;