Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 7 insertions, 1 deletions

diff --git a/dom/media/MediaData.h b/dom/media/MediaData.h
index 3ae8c1dbc2..f9f1aad2f1 100644
--- a/dom/media/MediaData.h
+++ b/dom/media/MediaData.h
@@ -23,6 +23,7 @@
 #  include "mozilla/gfx/Rect.h"
 #  include "nsString.h"
 #  include "nsTArray.h"
+#  include "EncoderConfig.h"
 
 namespace mozilla {
 
@@ -379,7 +380,7 @@ class NullData : public MediaData {
   static const Type sType = Type::NULL_DATA;
 };
 
-// Holds chunk a decoded audio frames.
+// Holds chunk a decoded interleaved audio frames.
 class AudioData : public MediaData {
  public:
   AudioData(int64_t aOffset, const media::TimeUnit& aTime,
@@ -389,6 +390,8 @@ class AudioData : public MediaData {
   static const Type sType = Type::AUDIO_DATA;
   static const char* sTypeName;
 
+  nsCString ToString() const;
+
   // Access the buffer as a Span.
   Span<AudioDataValue> Data() const;
 
@@ -721,6 +724,9 @@ class MediaRawData final : public MediaData {
   // Currently this is only used for the media engine DRM playback.
   bool mShouldCopyCryptoToRemoteRawData = false;
 
+  // Config used to encode this packet.
+  UniquePtr<const EncoderConfig> mConfig;
+
   // It's only used when the remote decoder reconstructs the media raw data.
   CryptoSample& GetWritableCrypto() { return mCryptoInternal; }