Backed out 2 changesets (bug 1811878) for causing bustages in FFmpegVideoFramePool.cpp. CLOSED TREE

Backed out changeset e37ee30891ca (bug 1811878)
Backed out changeset 601c39a76573 (bug 1811878)

dom/media/platforms/ffmpeg/FFmpegVideoFramePool.cpp

@@ -140,9 +140,6 @@ bool VideoFramePool<LIBAV_VER>::ShouldCopySurface() {
       "%f",
       (int)mDMABufSurfaces.Length(), surfacesUsed - surfacesUsedFFmpeg,
       surfacesUsedFFmpeg, mFFMPEGPoolSize, freeRatio);
-  if (StaticPrefs::media_ffmpeg_vaapi_force_surface_copy_AtStartup()) {
-    return true;
-  }
 
   MOZ_DIAGNOSTIC_ASSERT(mTextureCopyWorks.isSome());
   return mTextureCopyWorks.value() && freeRatio < SURFACE_COPY_THRESHOLD;

modules/libpref/init/StaticPrefList.yaml

@@ -10001,13 +10001,6 @@
   type: bool
   value: false
   mirror: once
-
-# Force to copy dmabuf video frames
-# Used for debugging/troubleshooting only
-- name: media.ffmpeg.vaapi.force-surface-copy
-  type: bool
-  value: false
-  mirror: once
 #endif # MOZ_WIDGET_GTK
 
 -   name: media.ffvpx.enabled

widget/gtk/DMABufSurface.cpp

@@ -1059,20 +1059,15 @@ bool DMABufSurfaceYUV::CreateYUVPlane(int aPlane) {
     return false;
   }
 
-  MOZ_DIAGNOSTIC_ASSERT(mGbmBufferObject[aPlane] == nullptr);
   bool useModifiers = (mBufferModifiers[aPlane] != DRM_FORMAT_MOD_INVALID);
   if (useModifiers) {
-    LOGDMABUF(("    Creating with modifiers"));
     mGbmBufferObject[aPlane] = nsGbmLib::CreateWithModifiers(
         GetDMABufDevice()->GetGbmDevice(), mWidth[aPlane], mHeight[aPlane],
         mDrmFormats[aPlane], mBufferModifiers + aPlane, 1);
-  }
-  if (!mGbmBufferObject[aPlane]) {
-    LOGDMABUF(("    Creating without modifiers"));
+  } else {
     mGbmBufferObject[aPlane] = nsGbmLib::Create(
         GetDMABufDevice()->GetGbmDevice(), mWidth[aPlane], mHeight[aPlane],
         mDrmFormats[aPlane], GBM_BO_USE_RENDERING);
-    mBufferModifiers[aPlane] = DRM_FORMAT_MOD_INVALID;
   }
   if (!mGbmBufferObject[aPlane]) {
     LOGDMABUF(("    Failed to create GbmBufferObject: %s", strerror(errno)));