Bug 1273947 - Update ResetDecode() to ResetDecode(TargetQueue) r?jya draft
authorAlexandre Lissy <lissyx@lissyx.dyndns.org>
Wed, 18 May 2016 18:27:14 +0200
changeset 369133 2447f392b7d5298c5f41f13f921c313a7e0c6bf1
parent 369022 c67dc1f9fab86d4f2cf3224307809c44fe3ce820
child 521476 360832ec80edc214952a0c58cb08de3987f895db
push id18754
push userbmo:lissyx+mozillians@lissyx.dyndns.org
push dateFri, 20 May 2016 13:08:59 +0000
reviewersjya
bugs1273947
milestone49.0a1
Bug 1273947 - Update ResetDecode() to ResetDecode(TargetQueue) r?jya MozReview-Commit-ID: A32znxwP5gb
dom/media/omx/MediaOmxReader.cpp
dom/media/omx/MediaOmxReader.h
--- 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;