Backed out 2 changesets (bug 1901076) for causing assertion failures @ image/RasterImage.cpp CLOSED TREE

Backed out changeset de52938146cd (bug 1901076)
Backed out changeset 79fece25d231 (bug 1901076)

Author: Sandor Molnar

dom/media/mp4/SampleIterator.cpp

@@ -80,29 +80,6 @@ SampleIterator::~SampleIterator() { mIndex->UnregisterIterator(this); }
 
 bool SampleIterator::HasNext() { return !!Get(); }
 
-already_AddRefed<MediaRawData> SampleIterator::GetNextHeader() {
-  Sample* s(Get());
-  if (!s) {
-    return nullptr;
-  }
-
-  int64_t length = std::numeric_limits<int64_t>::max();
-  mIndex->mSource->Length(&length);
-  if (s->mByteRange.mEnd > length) {
-    // We don't have this complete sample.
-    return nullptr;
-  }
-
-  RefPtr<MediaRawData> sample = new MediaRawData();
-  sample->mTimecode = s->mDecodeTime;
-  sample->mTime = s->mCompositionRange.start;
-  sample->mDuration = s->mCompositionRange.Length();
-  sample->mOffset = s->mByteRange.mStart;
-  sample->mKeyframe = s->mSync;
-  Next();
-  return sample.forget();
-}
-
 already_AddRefed<MediaRawData> SampleIterator::GetNext() {
   Sample* s(Get());
   if (!s) {

dom/media/mp4/SampleIterator.h

@@ -26,7 +26,6 @@ class SampleIterator {
   explicit SampleIterator(MP4SampleIndex* aIndex);
   ~SampleIterator();
   bool HasNext();
-  already_AddRefed<mozilla::MediaRawData> GetNextHeader();
   already_AddRefed<mozilla::MediaRawData> GetNext();
   void Seek(const media::TimeUnit& aTime);
   media::TimeUnit GetNextKeyframeTime();

image/Decoder.cpp

@@ -151,9 +151,6 @@ nsresult Decoder::Init() {
   // XXX(seth): Soon that exception will be removed.
   MOZ_ASSERT_IF(mImage, IsMetadataDecode());
 
-  // We can only request the frame count for metadata decoders.
-  MOZ_ASSERT_IF(WantsFrameCount(), IsMetadataDecode());
-
   // Implementation-specific initialization.
   nsresult rv = InitInternal();
 
@@ -470,10 +467,6 @@ void Decoder::PostIsAnimated(FrameTimeout aFirstFrameTimeout) {
   mImageMetadata.SetFirstFrameTimeout(aFirstFrameTimeout);
 }
 
-void Decoder::PostFrameCount(uint32_t aFrameCount) {
-  mImageMetadata.SetFrameCount(aFrameCount);
-}
-
 void Decoder::PostFrameStop(Opacity aFrameOpacity) {
   // We should be mid-frame
   MOZ_ASSERT(!IsMetadataDecode(), "Stopping frame during metadata decode");
@@ -540,16 +533,14 @@ void Decoder::PostInvalidation(const OrientedIntRect& aRect,
   }
 }
 
-void Decoder::PostLoopCount(int32_t aLoopCount) {
-  mImageMetadata.SetLoopCount(aLoopCount);
-}
-
-void Decoder::PostDecodeDone() {
+void Decoder::PostDecodeDone(int32_t aLoopCount /* = 0 */) {
   MOZ_ASSERT(!IsMetadataDecode(), "Done with decoding in metadata decode");
   MOZ_ASSERT(!mInFrame, "Can't be done decoding if we're mid-frame!");
   MOZ_ASSERT(!mDecodeDone, "Decode already done!");
   mDecodeDone = true;
 
+  mImageMetadata.SetLoopCount(aLoopCount);
+
   // Some metadata that we track should take into account every frame in the
   // image. If this is a first-frame-only decode, our accumulated loop length
   // and first frame refresh area only includes the first frame, so it's not

image/Decoder.h

@@ -197,13 +197,6 @@ class Decoder {
   }
   bool IsMetadataDecode() const { return mMetadataDecode; }
 
-  /**
-   * Should we return how many frames we expect are in the animation.
-   */
-  bool WantsFrameCount() const {
-    return bool(mDecoderFlags & DecoderFlags::COUNT_FRAMES);
-  }
-
   /**
    * Sets the output size of this decoder. If this is smaller than the intrinsic
    * size of the image, we'll downscale it while decoding. For memory usage
@@ -307,7 +300,7 @@ class Decoder {
   /// useless?
   bool GetDecodeDone() const {
     return mReachedTerminalState || mDecodeDone ||
-           (mMetadataDecode && HasSize() && !WantsFrameCount()) || HasError();
+           (mMetadataDecode && HasSize()) || HasError();
   }
 
   /// Are we in the middle of a frame right now? Used for assertions only.
@@ -512,10 +505,6 @@ class Decoder {
   //                 we advance to the next frame.
   void PostIsAnimated(FrameTimeout aFirstFrameTimeout);
 
-  // Called by decoders if they determine the expected frame count.
-  // @param aFrameCount The expected frame count.
-  void PostFrameCount(uint32_t aFrameCount);
-
   // Called by decoders when they end a frame. Informs the image, sends
   // notifications, and does internal book-keeping.
   // Specify whether this frame is opaque as an optimization.
@@ -538,16 +527,15 @@ class Decoder {
       const OrientedIntRect& aRect,
       const Maybe<OrientedIntRect>& aRectAtOutputSize = Nothing());
 
-  // For animated images, specify the loop count. -1 means loop forever, 0
-  // means a single iteration, stopping on the last frame.
-  void PostLoopCount(int32_t aLoopCount);
-
   // Called by the decoders when they have successfully decoded the image. This
   // may occur as the result of the decoder getting to the appropriate point in
   // the stream, or by us calling FinishInternal().
   //
   // May not be called mid-frame.
-  void PostDecodeDone();
+  //
+  // For animated images, specify the loop count. -1 means loop forever, 0
+  // means a single iteration, stopping on the last frame.
+  void PostDecodeDone(int32_t aLoopCount = 0);
 
   /**
    * Allocates a new frame, making it our current frame if successful.

image/DecoderFactory.cpp

@@ -178,11 +178,6 @@ nsresult DecoderFactory::CreateDecoder(
     return NS_ERROR_INVALID_ARG;
   }
 
-  // Only can use COUNT_FRAMES with metadata decoders.
-  if (NS_WARN_IF(bool(aDecoderFlags & DecoderFlags::COUNT_FRAMES))) {
-    return NS_ERROR_INVALID_ARG;
-  }
-
   // Create an anonymous decoder. Interaction with the SurfaceCache and the
   // owning RasterImage will be mediated by DecodedSurfaceProvider.
   RefPtr<Decoder> decoder = GetDecoder(
@@ -238,11 +233,6 @@ nsresult DecoderFactory::CreateAnimationDecoder(
     return NS_ERROR_INVALID_ARG;
   }
 
-  // Only can use COUNT_FRAMES with metadata decoders.
-  if (NS_WARN_IF(bool(aDecoderFlags & DecoderFlags::COUNT_FRAMES))) {
-    return NS_ERROR_INVALID_ARG;
-  }
-
   MOZ_ASSERT(aType == DecoderType::GIF || aType == DecoderType::PNG ||
                  aType == DecoderType::WEBP || aType == DecoderType::AVIF,
              "Calling CreateAnimationDecoder for non-animating DecoderType");
@@ -401,11 +391,6 @@ already_AddRefed<Decoder> DecoderFactory::CreateAnonymousDecoder(
     return nullptr;
   }
 
-  // Only can use COUNT_FRAMES with metadata decoders.
-  if (NS_WARN_IF(bool(aDecoderFlags & DecoderFlags::COUNT_FRAMES))) {
-    return nullptr;
-  }
-
   RefPtr<Decoder> decoder =
       GetDecoder(aType, /* aImage = */ nullptr, /* aIsRedecode = */ false);
   MOZ_ASSERT(decoder, "Should have a decoder now");
@@ -435,8 +420,7 @@ already_AddRefed<Decoder> DecoderFactory::CreateAnonymousDecoder(
 
 /* static */
 already_AddRefed<Decoder> DecoderFactory::CreateAnonymousMetadataDecoder(
-    DecoderType aType, NotNull<SourceBuffer*> aSourceBuffer,
-    DecoderFlags aDecoderFlags) {
+    DecoderType aType, NotNull<SourceBuffer*> aSourceBuffer) {
   if (aType == DecoderType::UNKNOWN) {
     return nullptr;
   }
@@ -448,7 +432,7 @@ already_AddRefed<Decoder> DecoderFactory::CreateAnonymousMetadataDecoder(
   // Initialize the decoder.
   decoder->SetMetadataDecode(true);
   decoder->SetIterator(aSourceBuffer->Iterator());
-  decoder->SetDecoderFlags(aDecoderFlags);
+  decoder->SetDecoderFlags(DecoderFlags::FIRST_FRAME_ONLY);
 
   if (NS_FAILED(decoder->Init())) {
     return nullptr;

image/DecoderFactory.h

@@ -190,11 +190,9 @@ class DecoderFactory {
    * @param aType Which type of decoder to create - JPEG, PNG, etc.
    * @param aSourceBuffer The SourceBuffer which the decoder will read its data
    *                      from.
-   * @param aDecoderFlags Flags specifying the behavior of this decoder.
    */
   static already_AddRefed<Decoder> CreateAnonymousMetadataDecoder(
-      DecoderType aType, NotNull<SourceBuffer*> aSourceBuffer,
-      DecoderFlags aDecoderFlags);
+      DecoderType aType, NotNull<SourceBuffer*> aSourceBuffer);
 
  private:
   virtual ~DecoderFactory() = 0;

image/DecoderFlags.h

@@ -42,14 +42,6 @@ enum class DecoderFlags : uint8_t {
   // "image.avif.sequence.animate_avif_major_branded_images" preference.
   AVIF_ANIMATE_AVIF_MAJOR = 1 << 6,
 #endif
-
-  /**
-   * By default, we don't count how many animated frames there are in an image,
-   * as that would require us to iterate over the entire buffer for some image
-   * formats. If the caller requires a full accounting of how many frames there
-   * are.
-   */
-  COUNT_FRAMES = 1 << 7,
 };
 MOZ_MAKE_ENUM_CLASS_BITWISE_OPERATORS(DecoderFlags)
 

image/ImageMetadata.h

@@ -38,10 +38,6 @@ class ImageMetadata {
   FrameTimeout GetLoopLength() const { return *mLoopLength; }
   bool HasLoopLength() const { return mLoopLength.isSome(); }
 
-  void SetFrameCount(uint32_t aCount) { mFrameCount = Some(aCount); }
-  uint32_t GetFrameCount() const { return *mFrameCount; }
-  bool HasFrameCount() const { return mFrameCount.isSome(); }
-
   void SetFirstFrameTimeout(FrameTimeout aTimeout) {
     mFirstFrameTimeout = aTimeout;
   }
@@ -98,9 +94,6 @@ class ImageMetadata {
   // The total length of a single loop through an animated image.
   Maybe<FrameTimeout> mLoopLength;
 
-  // The total number of frames we expect from the animated image.
-  Maybe<uint32_t> mFrameCount;
-
   /// The timeout of an animated image's first frame.
   FrameTimeout mFirstFrameTimeout = FrameTimeout::Forever();
 

image/ImageOps.cpp

@@ -171,11 +171,8 @@ nsresult ImageOps::DecodeMetadata(ImageBuffer* aBuffer,
   // Create a decoder.
   DecoderType decoderType =
       DecoderFactory::GetDecoderType(PromiseFlatCString(aMimeType).get());
-  DecoderFlags decoderFlags =
-      DecoderFactory::GetDefaultDecoderFlagsForType(decoderType);
-  decoderFlags |= DecoderFlags::FIRST_FRAME_ONLY;
   RefPtr<Decoder> decoder = DecoderFactory::CreateAnonymousMetadataDecoder(
-      decoderType, WrapNotNull(sourceBuffer), decoderFlags);
+      decoderType, WrapNotNull(sourceBuffer));
   if (!decoder) {
     return NS_ERROR_FAILURE;
   }

image/RasterImage.cpp

@@ -702,9 +702,6 @@ bool RasterImage::SetMetadata(const ImageMetadata& aMetadata,
     StoreHasSize(true);
   }
 
-  MOZ_ASSERT_IF(mAnimationState && !aFromMetadataDecode,
-                mAnimationState->LoopCount() == aMetadata.GetLoopCount());
-
   if (LoadHasSize() && aMetadata.HasAnimation() && !mAnimationState) {
     // We're becoming animated, so initialize animation stuff.
     mAnimationState.emplace(mAnimationMode);