zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Select openh264 includes based on OPENH264_API_WELS

Browse Source 
This should be landed after https://chromium-review.googlesource.com/c/chromium/src/+/3986032

Bug: chromium:1218384
Change-Id: Id4104d2914f811e722a083021f515fd06b69b910
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/280800
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Sergey Silkin <ssilkin@webrtc.org>
Reviewed-by: Bruce Dawson <brucedawson@google.com>
Reviewed-by: Åsa Persson <asapersson@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#38515}
This commit is contained in:
Sergey Silkin
2022-10-27 16:37:28 +02:00
committed by WebRTC LUCI CQ
parent a30f8829ff
commit 73f3393426
3 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/video_coding/BUILD.gn
View File

@ -544,6 +544,7 @@ rtc_library("webrtc_h264") {
if (rtc_use_h264) {
deps += [
"//third_party/ffmpeg",
"//third_party/openh264:buildflags",
"//third_party/openh264:encoder",
]
if (!build_with_mozilla) {

9
modules/video_coding/codecs/h264/h264_encoder_impl.cc
View File

@ -31,10 +31,19 @@
#include "system_wrappers/include/metrics.h"
#include "third_party/libyuv/include/libyuv/convert.h"
#include "third_party/libyuv/include/libyuv/scale.h"
// TODO(crbug.com/1218384): Remove after new openh264 is rolled.
#include "third_party/openh264/buildflags.h"
#if BUILDFLAG(OPENH264_API_WELS)
#include "third_party/openh264/src/codec/api/wels/codec_api.h"
#include "third_party/openh264/src/codec/api/wels/codec_app_def.h"
#include "third_party/openh264/src/codec/api/wels/codec_def.h"
#include "third_party/openh264/src/codec/api/wels/codec_ver.h"
#else
#include "third_party/openh264/src/codec/api/svc/codec_api.h"
#include "third_party/openh264/src/codec/api/svc/codec_app_def.h"
#include "third_party/openh264/src/codec/api/svc/codec_def.h"
#include "third_party/openh264/src/codec/api/svc/codec_ver.h"
#endif
namespace webrtc {

6
modules/video_coding/codecs/h264/h264_encoder_impl.h
View File

@ -30,7 +30,13 @@
#include "modules/video_coding/codecs/h264/include/h264.h"
#include "modules/video_coding/svc/scalable_video_controller.h"
#include "modules/video_coding/utility/quality_scaler.h"
// TODO(crbug.com/1218384): Remove after new openh264 is rolled.
#include "third_party/openh264/buildflags.h"
#if BUILDFLAG(OPENH264_API_WELS)
#include "third_party/openh264/src/codec/api/wels/codec_app_def.h"
#else
#include "third_party/openh264/src/codec/api/svc/codec_app_def.h"
#endif
class ISVCEncoder;