Commit a59dfbcb authored by jwilde's avatar jwilde Committed by Pier Angelo Vendrame
Browse files

BB 42758: Fix WebRTC build errors.

parent 337db0df

third_party/libwebrtc/modules/desktop_capture/win/wgc_capture_session.cc

+4 −7
Original line number Diff line number Diff line
@@ -10,9 +10,9 @@ 


#include "modules/desktop_capture/win/wgc_capture_session.h"



#include <DispatcherQueue.h>

#include <dispatcherqueue.h>

#include <windows.graphics.capture.interop.h>

#include <windows.graphics.directX.direct3d11.interop.h>

#include <windows.graphics.directx.direct3d11.interop.h>

#include <windows.graphics.h>

#include <wrl/client.h>

#include <wrl/event.h>
@@ -193,8 +193,7 @@ bool WgcCaptureSession::MayContainCursor() const { 
  // IsCursorCaptureEnabled was introduced in IGraphicsCaptureSession2.

  // Default to true (cursor captured) if the interface is not available.

  ComPtr<ABI::Windows::Graphics::Capture::IGraphicsCaptureSession2> session2;

  HRESULT hr = session_->QueryInterface(

      ABI::Windows::Graphics::Capture::IID_IGraphicsCaptureSession2, &session2);

  HRESULT hr = session_->QueryInterface(IID_PPV_ARGS(&session2));

  if (FAILED(hr)) {

    return true;

  }
@@ -299,9 +298,7 @@ HRESULT WgcCaptureSession::StartCapture(const DesktopCaptureOptions& options) { 
      options.prefer_cursor_embedded() || allow_using_texture_;

  if (!embed_cursor) {

    ComPtr<ABI::Windows::Graphics::Capture::IGraphicsCaptureSession2> session2;

    if (SUCCEEDED(session_->QueryInterface(

            ABI::Windows::Graphics::Capture::IID_IGraphicsCaptureSession2,

            &session2))) {

    if (SUCCEEDED(session_->QueryInterface(IID_PPV_ARGS(&session2)))) {

      session2->put_IsCursorCaptureEnabled(false);

    }

  }

third_party/libwebrtc/modules/desktop_capture/win/wgc_capturer_win.cc

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 


#include "modules/desktop_capture/win/wgc_capturer_win.h"



#include <DispatcherQueue.h>

#include <dispatcherqueue.h>

#include <dxgi1_4.h>

#include <windows.foundation.metadata.h>

#include <windows.graphics.capture.h>

third_party/libwebrtc/modules/desktop_capture/win/wgc_capturer_win.h

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
#ifndef MODULES_DESKTOP_CAPTURE_WIN_WGC_CAPTURER_WIN_H_

#define MODULES_DESKTOP_CAPTURE_WIN_WGC_CAPTURER_WIN_H_



#include <DispatcherQueue.h>

#include <dispatcherqueue.h>

#include <d3d11.h>

#include <wrl/client.h>