VAAPI Wrapper: refactor management of drm file

content/common/gpu/media/vaapi_wrapper.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/common/gpu/media/vaapi_wrapper.h"
 
 #include <dlfcn.h>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 44 matching lines @@
       return (ret);                                        \
     }                                                      \
   } while (0)
 
 namespace content {
 
 // Maximum framerate of encoded profile. This value is an arbitary limit
 // and not taken from HW documentation.
 const int kMaxEncoderFramerate = 30;
 
+#if defined(USE_OZONE)
+base::LazyInstance<base::File>
+    VaapiWrapper::drm_file_ = LAZY_INSTANCE_INITIALIZER;
+#endif
+
 base::LazyInstance<VaapiWrapper::LazyProfileInfos>
     VaapiWrapper::profile_infos_ = LAZY_INSTANCE_INITIALIZER;
 
 // Config attributes common for both encode and decode.
 static const VAConfigAttrib kCommonVAConfigAttribs[] = {
     {VAConfigAttribRTFormat, VA_RT_FORMAT_YUV420},
 };
 
 // Attributes required for encode.
 static const VAConfigAttrib kEncodeVAConfigAttribs[] = {
@@ skipping 235 matching lines @@
     return false;
   }
 
   report_error_to_uma_cb_ = report_error_to_uma_cb;
 
   base::AutoLock auto_lock(va_lock_);
 
 #if defined(USE_X11)
   va_display_ = vaGetDisplay(gfx::GetXDisplay());
 #elif defined(USE_OZONE)
-  const char* kDriRenderNode0Path = "/dev/dri/renderD128";
-  drm_file_ = base::File(base::FilePath::FromUTF8Unsafe(kDriRenderNode0Path),
-                         base::File::FLAG_OPEN | base::File::FLAG_READ |
-                         base::File::FLAG_WRITE);
-  va_display_ = vaGetDisplayDRM(drm_file_.GetPlatformFile());
+  va_display_ = vaGetDisplayDRM(drm_file_.Get().GetPlatformFile());

[dnicoara, 2015/05/07 21:17:09]

Previously, weren't we crashing because of double close from the VAAPI? Would
this cause a similar crash if you'd have multiple instances of VaapiWrapper?
You'll need to dup the FD in that case.

[hshi1, 2015/05/07 21:50:17]

The double close (bug 464628) was because we're using the same FD for the
primary graphics device (/dev/dri/card0) for libva and libdrm_intel. As long as
we use a separate FD for libva (shared by multiple instances of VaapiWrapper) we
would not hit the double close issue.

[dnicoara, 2015/05/07 22:04:27]

Are you sure VAApiWrapper is shared? If I open multiple web pages with HTML5
videos, I see libva initializing multiple times. I think it is getting in here
multiple times.

 #endif  // USE_X11
 
   if (!vaDisplayIsValid(va_display_)) {
     LOG(ERROR) << "Could not get a valid VA display";
     return false;
   }
 
   VAStatus va_res = vaInitialize(va_display_, &major_version_, &minor_version_);
   VA_SUCCESS_OR_RETURN(va_res, "vaInitialize failed", false);
   va_initialized_ = true;
@@ skipping 700 matching lines @@
     vaDestroyContext(va_display_, va_vpp_context_id_);
     va_vpp_context_id_ = VA_INVALID_ID;
   }
   if (va_vpp_config_id_ != VA_INVALID_ID) {
     vaDestroyConfig(va_display_, va_vpp_config_id_);
     va_vpp_config_id_ = VA_INVALID_ID;
   }
 }
 
 // static
+void VaapiWrapper::PreSandboxInitialization() {
+#if defined(USE_OZONE)
+  const char* kDriRenderNode0Path = "/dev/dri/renderD128";
+  drm_file_.Get().Initialize(
+        base::FilePath::FromUTF8Unsafe(kDriRenderNode0Path),
+        base::File::FLAG_OPEN | base::File::FLAG_READ |
+        base::File::FLAG_WRITE);
+#endif
+}
+
+// static
 bool VaapiWrapper::PostSandboxInitialization() {
   StubPathMap paths;
 
   paths[kModuleVa].push_back("libva.so.1");
 
 #if defined(USE_X11)
   paths[kModuleVa_x11].push_back("libva-x11.so.1");
 #elif defined(USE_OZONE)
   paths[kModuleVa_drm].push_back("libva-drm.so.1");
 #endif
@@ skipping 26 matching lines @@
 bool VaapiWrapper::LazyProfileInfos::IsProfileSupported(
     CodecMode mode, VAProfile va_profile) {
   for (const auto& profile : supported_profiles_[mode]) {
     if (profile.va_profile == va_profile)
       return true;
   }
   return false;
 }
 
 }  // namespace content