Commit 3ef6a5c0 authored by Jed Davis's avatar Jed Davis
Browse files

Bug 1698778 - Allow using VA-API in the RDD process. r=alwu,stransky 

The previous patches mean that VA-API shouldn't cause sandbox violations
in the RDD process, so there's no need to lock it out.

This patch does **not** change the prefs to enable it
(`media.rdd-ffmpeg.enabled` and `media.ffmpeg.vaapi.enabled`), but now
those prefs will be honored if they are flipped, to allow testing.

Differential Revision: https://phabricator.services.mozilla.com/D131681
parent 23ba2c71

widget/gtk/DMABufLibWrapper.cpp

+6 −8
Original line number Diff line number Diff line
@@ -266,22 +266,20 @@ bool nsDMABufDevice::IsDMABufTexturesEnabled() { return false; } 
bool nsDMABufDevice::IsDMABufVideoEnabled() {

  LOGDMABUF(

      ("nsDMABufDevice::IsDMABufVideoEnabled: EGL %d DMABufEnabled %d  "

       "!media_ffmpeg_dmabuf_textures_disabled %d !XRE_IsRDDProcess() %d\n",

       "!media_ffmpeg_dmabuf_textures_disabled %d\n",

       gfx::gfxVars::UseEGL(), IsDMABufEnabled(),

       !StaticPrefs::media_ffmpeg_dmabuf_textures_disabled(),

       !XRE_IsRDDProcess()));

       !StaticPrefs::media_ffmpeg_dmabuf_textures_disabled()));

  return !StaticPrefs::media_ffmpeg_dmabuf_textures_disabled() &&

         !XRE_IsRDDProcess() && gfx::gfxVars::UseDMABuf() && IsDMABufEnabled();

         gfx::gfxVars::UseDMABuf() && IsDMABufEnabled();

}

bool nsDMABufDevice::IsDMABufVAAPIEnabled() {

  LOGDMABUF(

      ("nsDMABufDevice::IsDMABufVAAPIEnabled: EGL %d DMABufEnabled %d  "

       "media_ffmpeg_vaapi_enabled %d CanUseHardwareVideoDecoding %d "

       "!XRE_IsRDDProcess %d\n",

       "media_ffmpeg_vaapi_enabled %d CanUseHardwareVideoDecoding %d\n",

       gfx::gfxVars::UseEGL(), IsDMABufEnabled(),

       StaticPrefs::media_ffmpeg_vaapi_enabled(),

       gfx::gfxVars::CanUseHardwareVideoDecoding(), !XRE_IsRDDProcess()));

  return StaticPrefs::media_ffmpeg_vaapi_enabled() && !XRE_IsRDDProcess() &&

       gfx::gfxVars::CanUseHardwareVideoDecoding()));

  return StaticPrefs::media_ffmpeg_vaapi_enabled() &&

         gfx::gfxVars::UseDMABuf() && IsDMABufEnabled() &&

         gfx::gfxVars::CanUseHardwareVideoDecoding();

}