Skip to content

Commit

Permalink
chore: Add is_win condition.
Browse files Browse the repository at this point in the history
  • Loading branch information
cloudwebrtc committed Dec 10, 2021
1 parent 5497e1c commit 3c10531
Show file tree
Hide file tree
Showing 2 changed files with 68 additions and 59 deletions.
99 changes: 52 additions & 47 deletions BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -105,56 +105,59 @@ rtc_shared_library("libwebrtc"){
"src/rtc_dtls_transport_impl.h",
"src/rtc_dtmf_sender_impl.cc",
"src/rtc_dtmf_sender_impl.h",
#"talk/owt/sdk/base/codecutils.h",
#"talk/owt/sdk/base/codecutils.cc",
#"talk/owt/sdk/base/win/mediacapabilities.h",
#"talk/owt/sdk/base/win/mediacapabilities.cc",
#"talk/owt/sdk/base/win/msdkcommon.h",
#"talk/owt/sdk/base/win/msdkvideobase.h",
#"talk/owt/sdk/base/win/msdkvideobase.cc",
#"talk/owt/sdk/base/win/msdkvideoencoder.h",
#"talk/owt/sdk/base/win/msdkvideoencoder.cc",
"src/win/commontypes.h",
"src/win/msdkcommon.h",
"src/win/mediautils.h",
"src/win/mediautils.cc",
"src/win/d3d_allocator.h",
"src/win/d3d_allocator.cc",
"src/win/d3d11_allocator.h",
"src/win/d3d11_allocator.cc",
"src/win/msdkvideobase.h",
"src/win/msdkvideobase.cc",
"src/win/msdkvideoencoder.h",
"src/win/msdkvideoencoder.cc",
"src/win/base_allocator.h",
"src/win/base_allocator.cc",
"src/win/sysmem_allocator.h",
"src/win/sysmem_allocator.cc",
"src/win/msdkvideoencoderfactory.h",
"src/win/msdkvideoencoderfactory.cc",
"src/win/mediacapabilities.h",
"src/win/mediacapabilities.cc",
"src/win/codecutils.h",
"src/win/codecutils.cc",
"src/win/msdkvideodecoder.h",
"src/win/msdkvideodecoder.cc",
"src/win/msdkvideodecoderfactory.h",
"src/win/msdkvideodecoderfactory.cc",
"src/win/d3dnativeframe.h",
"src/win/d3d11_manager.h",
"src/win/videorendererinterface.h",
"src/win/nativehandlebuffer.h",
]

if(is_win) {
sources += [
"src/win/commontypes.h",
"src/win/msdkcommon.h",
"src/win/mediautils.h",
"src/win/mediautils.cc",
"src/win/d3d_allocator.h",
"src/win/d3d_allocator.cc",
"src/win/d3d11_allocator.h",
"src/win/d3d11_allocator.cc",
"src/win/msdkvideobase.h",
"src/win/msdkvideobase.cc",
"src/win/msdkvideoencoder.h",
"src/win/msdkvideoencoder.cc",
"src/win/base_allocator.h",
"src/win/base_allocator.cc",
"src/win/sysmem_allocator.h",
"src/win/sysmem_allocator.cc",
"src/win/msdkvideoencoderfactory.h",
"src/win/msdkvideoencoderfactory.cc",
"src/win/mediacapabilities.h",
"src/win/mediacapabilities.cc",
"src/win/codecutils.h",
"src/win/codecutils.cc",
"src/win/msdkvideodecoder.h",
"src/win/msdkvideodecoder.cc",
"src/win/msdkvideodecoderfactory.h",
"src/win/msdkvideodecoderfactory.cc",
"src/win/d3dnativeframe.h",
"src/win/d3d11_manager.h",
"src/win/videorendererinterface.h",
"src/win/nativehandlebuffer.h",
]
}

include_dirs = [
".",
"include",
"src/win/include",

]

defines = [
"USE_LIBYUV",
"WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
"USE_INTEL_MEDIA_SDK",
]

if(is_win) {
include_dirs += [ "src/win/include" ]
defines += [ "USE_INTEL_MEDIA_SDK" ]
}

public_configs = [ ":external_config" ]

Expand Down Expand Up @@ -198,12 +201,14 @@ rtc_shared_library("libwebrtc"){
"//third_party/libyuv",
]
libs = []
libs += [ "libmfx_vs2015.lib" ]
lib_dirs = [ "src\win\lib\x64" ]

ldflags = [
"/ignore:4098",
"/ignore:4099",
]

if(is_win) {
libs += [ "libmfx_vs2015.lib" ]
lib_dirs = [ "src\win\lib\x64" ]
ldflags = [
"/ignore:4098",
"/ignore:4099",
]
}
}

28 changes: 16 additions & 12 deletions src/rtc_peerconnection_factory_impl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,25 @@
#include "api/video_codecs/builtin_video_decoder_factory.h"
#include "api/video_codecs/builtin_video_encoder_factory.h"
#include "modules/audio_device/audio_device_impl.h"
#include "src/win/msdkvideoencoderfactory.h"
#include "src/win/msdkvideodecoderfactory.h"
#include "src/win/msdkvideoencoderfactory.h"
#if defined(WEBRTC_IOS)
#include "engine/sdk/objc/Framework/Classes/videotoolboxvideocodecfactory.h"
#endif
#include <api/task_queue/default_task_queue_factory.h>

namespace libwebrtc {

#if defined(USE_INTEL_MEDIA_SDK)
std::unique_ptr<webrtc::VideoEncoderFactory> CreateIntelVideoEncoderFactory() {
return std::make_unique<owt::base::MSDKVideoEncoderFactory>();
}

std::unique_ptr<webrtc::VideoDecoderFactory> CreateIntelVideoDecoderFactory() {
return std::make_unique<owt::base::MSDKVideoDecoderFactory>();
}
#endif

RTCPeerConnectionFactoryImpl::RTCPeerConnectionFactoryImpl(
rtc::Thread* worker_thread,
rtc::Thread* signaling_thread,
Expand All @@ -32,14 +42,6 @@ RTCPeerConnectionFactoryImpl::RTCPeerConnectionFactoryImpl(

RTCPeerConnectionFactoryImpl::~RTCPeerConnectionFactoryImpl() {}

std::unique_ptr<webrtc::VideoEncoderFactory> CreateFakeVideoEncoderFactory() {
return std::make_unique<owt::base::MSDKVideoEncoderFactory>();
}

std::unique_ptr<webrtc::VideoDecoderFactory> CreateFakeVideoDecoderFactory() {
return std::make_unique<owt::base::MSDKVideoDecoderFactory>();
}

bool RTCPeerConnectionFactoryImpl::Initialize() {
if (!audio_device_module_) {
task_queue_factory_ = webrtc::CreateDefaultTaskQueueFactory();
Expand All @@ -52,10 +54,12 @@ bool RTCPeerConnectionFactoryImpl::Initialize() {
network_thread_, worker_thread_, signaling_thread_,
audio_device_module_.get(), webrtc::CreateBuiltinAudioEncoderFactory(),
webrtc::CreateBuiltinAudioDecoderFactory(),
CreateFakeVideoEncoderFactory(),
//CreateFakeVideoDecoderFactory(),
//webrtc::CreateBuiltinVideoEncoderFactory(),
#if defined(USE_INTEL_MEDIA_SDK)
CreateIntelVideoEncoderFactory(), CreateIntelVideoDecoderFactory(),
#else
webrtc::CreateBuiltinVideoEncoderFactory(),
webrtc::CreateBuiltinVideoDecoderFactory(),
#endif
nullptr, nullptr);
}

Expand Down

0 comments on commit 3c10531

Please sign in to comment.