Skip to content
This repository was archived by the owner on Oct 25, 2024. It is now read-only.

Commit f1cef99

Browse files
daijhtaste1981
daijh
authored and
taste1981
committed
1. Remove webrtc-example and webrtc-tools build
2. Remove ssl dependency 3. Simplify webrtc-base 4. Add woogeen ffmpeg and openh264 dependency in video_coding Signed-off-by: jdai12 <[email protected]> Change-Id: I12950d6e20c2812b0b51ab9e3908c3bc094ba11b Reviewed-on: https://git-ccr-1.devtools.intel.com/gerrit/55760 Reviewed-by: Qiu, Jianlin <[email protected]> Tested-by: Qiu, Jianlin <[email protected]>
1 parent c7b8c9e commit f1cef99

File tree

7 files changed

+106
-101
lines changed

7 files changed

+106
-101
lines changed

‎BUILD.gn

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ group("default") {
1212
testonly = true
1313
deps = [
1414
"//webrtc",
15-
"//webrtc/examples",
16-
"//webrtc/tools",
15+
#"//webrtc/examples",
16+
#"//webrtc/tools",
1717
]
1818
if (rtc_include_tests) {
1919
deps += [ "//webrtc:webrtc_tests" ]

‎webrtc/base/BUILD.gn

Lines changed: 88 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -61,23 +61,23 @@ config("rtc_base_all_dependent_config") {
6161
}
6262
}
6363

64-
if (is_linux && !build_with_chromium) {
65-
# Provides the same functionality as the //crypto:platform target, which
66-
# WebRTC cannot use as we don't sync src/crypto from Chromium.
67-
group("linux_system_ssl") {
68-
deps = [
69-
"//third_party/boringssl",
70-
]
71-
}
72-
}
73-
74-
if (!rtc_build_ssl) {
75-
config("external_ssl_library") {
76-
assert(rtc_ssl_root != "",
77-
"You must specify rtc_ssl_root when rtc_build_ssl==0.")
78-
include_dirs = [ rtc_ssl_root ]
79-
}
80-
}
64+
#if (is_linux && !build_with_chromium) {
65+
# # Provides the same functionality as the //crypto:platform target, which
66+
# # WebRTC cannot use as we don't sync src/crypto from Chromium.
67+
# group("linux_system_ssl") {
68+
# deps = [
69+
# "//third_party/boringssl",
70+
# ]
71+
# }
72+
#}
73+
74+
#if (!rtc_build_ssl) {
75+
# config("external_ssl_library") {
76+
# assert(rtc_ssl_root != "",
77+
# "You must specify rtc_ssl_root when rtc_build_ssl==0.")
78+
# include_dirs = [ rtc_ssl_root ]
79+
# }
80+
#}
8181

8282
source_set("protobuf_utils") {
8383
sources = [
@@ -406,76 +406,76 @@ rtc_static_library("rtc_base") {
406406
"gunit_prod.h",
407407
"helpers.cc",
408408
"helpers.h",
409-
"httpbase.cc",
410-
"httpbase.h",
411-
"httpcommon-inl.h",
412-
"httpcommon.cc",
413-
"httpcommon.h",
414-
"ipaddress.cc",
415-
"ipaddress.h",
409+
# "httpbase.cc",
410+
# "httpbase.h",
411+
# "httpcommon-inl.h",
412+
# "httpcommon.cc",
413+
# "httpcommon.h",
414+
# "ipaddress.cc",
415+
# "ipaddress.h",
416416
"messagedigest.cc",
417417
"messagedigest.h",
418418
"messagehandler.cc",
419419
"messagehandler.h",
420420
"messagequeue.cc",
421421
"messagequeue.h",
422-
"nethelpers.cc",
423-
"nethelpers.h",
424-
"network.cc",
425-
"network.h",
426-
"networkmonitor.cc",
427-
"networkmonitor.h",
428-
"nullsocketserver.cc",
429-
"nullsocketserver.h",
430-
"openssl.h",
431-
"openssladapter.cc",
432-
"openssladapter.h",
433-
"openssldigest.cc",
434-
"openssldigest.h",
435-
"opensslidentity.cc",
436-
"opensslidentity.h",
437-
"opensslstreamadapter.cc",
438-
"opensslstreamadapter.h",
439-
"physicalsocketserver.cc",
440-
"physicalsocketserver.h",
441-
"proxyinfo.cc",
442-
"proxyinfo.h",
443-
"ratelimiter.cc",
444-
"ratelimiter.h",
445-
"rtccertificate.cc",
446-
"rtccertificate.h",
447-
"rtccertificategenerator.cc",
448-
"rtccertificategenerator.h",
449-
"sha1.cc",
450-
"sha1.h",
451-
"sha1digest.cc",
452-
"sha1digest.h",
453-
"sharedexclusivelock.cc",
454-
"sharedexclusivelock.h",
455-
"signalthread.cc",
456-
"signalthread.h",
457-
"sigslot.cc",
458-
"sigslot.h",
459-
"sigslotrepeater.h",
460-
"socket.h",
461-
"socketadapters.cc",
462-
"socketadapters.h",
463-
"socketaddress.cc",
464-
"socketaddress.h",
465-
"socketaddresspair.cc",
466-
"socketaddresspair.h",
467-
"socketfactory.h",
468-
"socketserver.h",
469-
"socketstream.cc",
470-
"socketstream.h",
471-
"ssladapter.cc",
472-
"ssladapter.h",
473-
"sslfingerprint.cc",
474-
"sslfingerprint.h",
475-
"sslidentity.cc",
476-
"sslidentity.h",
477-
"sslstreamadapter.cc",
478-
"sslstreamadapter.h",
422+
# "nethelpers.cc",
423+
# "nethelpers.h",
424+
# "network.cc",
425+
# "network.h",
426+
# "networkmonitor.cc",
427+
# "networkmonitor.h",
428+
# "nullsocketserver.cc",
429+
# "nullsocketserver.h",
430+
# "openssl.h",
431+
# "openssladapter.cc",
432+
# "openssladapter.h",
433+
# "openssldigest.cc",
434+
# "openssldigest.h",
435+
# "opensslidentity.cc",
436+
# "opensslidentity.h",
437+
# "opensslstreamadapter.cc",
438+
# "opensslstreamadapter.h",
439+
# "physicalsocketserver.cc",
440+
# "physicalsocketserver.h",
441+
# "proxyinfo.cc",
442+
# "proxyinfo.h",
443+
# "ratelimiter.cc",
444+
# "ratelimiter.h",
445+
# "rtccertificate.cc",
446+
# "rtccertificate.h",
447+
# "rtccertificategenerator.cc",
448+
# "rtccertificategenerator.h",
449+
# "sha1.cc",
450+
# "sha1.h",
451+
# "sha1digest.cc",
452+
# "sha1digest.h",
453+
# "sharedexclusivelock.cc",
454+
# "sharedexclusivelock.h",
455+
# "signalthread.cc",
456+
# "signalthread.h",
457+
# "sigslot.cc",
458+
# "sigslot.h",
459+
# "sigslotrepeater.h",
460+
# "socket.h",
461+
# "socketadapters.cc",
462+
# "socketadapters.h",
463+
# "socketaddress.cc",
464+
# "socketaddress.h",
465+
# "socketaddresspair.cc",
466+
# "socketaddresspair.h",
467+
# "socketfactory.h",
468+
# "socketserver.h",
469+
# "socketstream.cc",
470+
# "socketstream.h",
471+
# "ssladapter.cc",
472+
# "ssladapter.h",
473+
# "sslfingerprint.cc",
474+
# "sslfingerprint.h",
475+
# "sslidentity.cc",
476+
# "sslidentity.h",
477+
# "sslstreamadapter.cc",
478+
# "sslstreamadapter.h",
479479
"stream.cc",
480480
"stream.h",
481481
"thread.cc",
@@ -500,8 +500,8 @@ rtc_static_library("rtc_base") {
500500
configs += [ ":rtc_base_warnings_config" ]
501501
sources += [
502502
"callback.h",
503-
"json.cc",
504-
"json.h",
503+
# "json.cc",
504+
# "json.h",
505505
"logsinks.cc",
506506
"logsinks.h",
507507
"mathutils.h",
@@ -540,11 +540,11 @@ rtc_static_library("rtc_base") {
540540
}
541541
} # !build_with_chromium
542542

543-
if (rtc_build_ssl) {
544-
deps += [ "//third_party/boringssl" ]
545-
} else {
546-
configs += [ ":external_ssl_library" ]
547-
}
543+
# if (rtc_build_ssl) {
544+
# deps += [ "//third_party/boringssl" ]
545+
# } else {
546+
# configs += [ ":external_ssl_library" ]
547+
# }
548548

549549
if (is_android) {
550550
sources += [

‎webrtc/modules/video_coding/BUILD.gn

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,13 @@ rtc_static_library("webrtc_h264") {
172172
deps += [
173173
"../../common_video",
174174
"../../media:rtc_media_base",
175-
"//third_party/ffmpeg:ffmpeg",
176-
"//third_party/openh264:encoder",
175+
#"//third_party/ffmpeg:ffmpeg",
176+
#"//third_party/openh264:encoder",
177+
]
178+
179+
include_dirs = [
180+
"../../../../../../build/libdeps/build/include",
181+
"../../../../../../third_party/openh264",
177182
]
178183
}
179184
}

‎webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
#include <limits>
1616

1717
extern "C" {
18-
#include "third_party/ffmpeg/libavcodec/avcodec.h"
19-
#include "third_party/ffmpeg/libavformat/avformat.h"
20-
#include "third_party/ffmpeg/libavutil/imgutils.h"
18+
#include "libavcodec/avcodec.h"
19+
#include "libavformat/avformat.h"
20+
#include "libavutil/imgutils.h"
2121
} // extern "C"
2222

2323
#include "webrtc/api/video/i420_buffer.h"

‎webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include "webrtc/modules/video_coding/codecs/h264/include/h264.h"
1818

1919
extern "C" {
20-
#include "third_party/ffmpeg/libavcodec/avcodec.h"
20+
#include "libavcodec/avcodec.h"
2121
} // extern "C"
2222

2323
#include "webrtc/common_video/h264/h264_bitstream_parser.h"

‎webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
#include <limits>
1515
#include <string>
1616

17-
#include "third_party/openh264/src/codec/api/svc/codec_api.h"
18-
#include "third_party/openh264/src/codec/api/svc/codec_app_def.h"
19-
#include "third_party/openh264/src/codec/api/svc/codec_def.h"
20-
#include "third_party/openh264/src/codec/api/svc/codec_ver.h"
17+
#include "codec/api/svc/codec_api.h"
18+
#include "codec/api/svc/codec_app_def.h"
19+
#include "codec/api/svc/codec_def.h"
20+
#include "codec/api/svc/codec_ver.h"
2121

2222
#include "webrtc/base/checks.h"
2323
#include "webrtc/base/logging.h"

‎webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include "webrtc/modules/video_coding/codecs/h264/include/h264.h"
2020
#include "webrtc/modules/video_coding/utility/quality_scaler.h"
2121

22-
#include "third_party/openh264/src/codec/api/svc/codec_app_def.h"
22+
#include "codec/api/svc/codec_app_def.h"
2323

2424
class ISVCEncoder;
2525

0 commit comments

Comments
 (0)