From 888df264aa7c71281d5c95b521a91a3639bc3ab2 Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@redhat.com>
Date: Mon, 30 May 2022 21:40:33 +0200
Subject: Update to 101.0

---
 D145094.diff | 61 ------------------------------------------------------------
 1 file changed, 61 deletions(-)
 delete mode 100644 D145094.diff

(limited to 'D145094.diff')

diff --git a/D145094.diff b/D145094.diff
deleted file mode 100644
index 711acc9..0000000
--- a/D145094.diff
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -up firefox-100.0/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.cpp.D145094 firefox-100.0/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.cpp
---- firefox-100.0/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.cpp.D145094	2022-04-29 01:01:46.000000000 +0200
-+++ firefox-100.0/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.cpp	2022-05-03 09:51:48.570471687 +0200
-@@ -23,7 +23,7 @@ RefPtr<layers::Image> VideoFrameSurface<
- VideoFrameSurface<LIBAV_VER>::VideoFrameSurface(DMABufSurface* aSurface)
-     : mSurface(aSurface),
-       mLib(nullptr),
--      mAVHWDeviceContext(nullptr),
-+      mAVHWFrameContext(nullptr),
-       mHWAVBuffer(nullptr) {
-   // Create global refcount object to track mSurface usage over
-   // gects rendering engine. We can't release it until it's used
-@@ -38,16 +38,22 @@ VideoFrameSurface<LIBAV_VER>::VideoFrame
- void VideoFrameSurface<LIBAV_VER>::LockVAAPIData(
-     AVCodecContext* aAVCodecContext, AVFrame* aAVFrame,
-     FFmpegLibWrapper* aLib) {
--  FFMPEG_LOG("VideoFrameSurface: VAAPI locking dmabuf surface UID = %d",
--             mSurface->GetUID());
-+  MOZ_DIAGNOSTIC_ASSERT(aAVCodecContext->hw_frames_ctx);
-   mLib = aLib;
--  mAVHWDeviceContext = aLib->av_buffer_ref(aAVCodecContext->hw_device_ctx);
-+  mAVHWFrameContext = aLib->av_buffer_ref(aAVCodecContext->hw_frames_ctx);
-   mHWAVBuffer = aLib->av_buffer_ref(aAVFrame->buf[0]);
-+  FFMPEG_LOG(
-+      "VideoFrameSurface: VAAPI locking dmabuf surface UID = %d "
-+      "mAVHWFrameContext %p mHWAVBuffer %p",
-+      mSurface->GetUID(), mAVHWFrameContext, mHWAVBuffer);
- }
- 
- void VideoFrameSurface<LIBAV_VER>::ReleaseVAAPIData(bool aForFrameRecycle) {
--  FFMPEG_LOG("VideoFrameSurface: VAAPI releasing dmabuf surface UID = %d",
--             mSurface->GetUID());
-+  FFMPEG_LOG(
-+      "VideoFrameSurface: VAAPI releasing dmabuf surface UID = %d "
-+      "aForFrameRecycle %d mLib %p mAVHWFrameContext %p mHWAVBuffer %p",
-+      mSurface->GetUID(), aForFrameRecycle, mLib, mAVHWFrameContext,
-+      mHWAVBuffer);
- 
-   // It's possible to unref GPU data while IsUsed() is still set.
-   // It can happens when VideoFramePool is deleted while decoder shutdown
-@@ -57,7 +63,7 @@ void VideoFrameSurface<LIBAV_VER>::Relea
-   // is closed.
-   if (mLib) {
-     mLib->av_buffer_unref(&mHWAVBuffer);
--    mLib->av_buffer_unref(&mAVHWDeviceContext);
-+    mLib->av_buffer_unref(&mAVHWFrameContext);
-   }
- 
-   // If we want to recycle the frame, make sure it's not used
-diff -up firefox-100.0/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.h.D145094 firefox-100.0/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.h
---- firefox-100.0/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.h.D145094	2022-04-29 00:02:40.000000000 +0200
-+++ firefox-100.0/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.h	2022-05-03 09:33:27.110885715 +0200
-@@ -102,7 +102,7 @@ class VideoFrameSurface<LIBAV_VER> {
- 
-   const RefPtr<DMABufSurface> mSurface;
-   const FFmpegLibWrapper* mLib;
--  AVBufferRef* mAVHWDeviceContext;
-+  AVBufferRef* mAVHWFrameContext;
-   AVBufferRef* mHWAVBuffer;
- };
- 
-- 
cgit