Bug 232873

Summary:

Update libwebrtc to M96

Product:

WebKit

Reporter:

youenn fablet <youennf>

Component:

WebRTC

Assignee:

youenn fablet <youennf>

Status:

RESOLVED FIXED

Severity:

Normal

CC:

achristensen, annulen, eric.carlson, ews-watchlist, glefebvr, glenn, gyuyoung.kim, hta, jaya.allamsetty, jer.noble, philipj, pnormand, ryuan.choi, sergio, tommyw, vjaquez, webkit-bug-importer, youennf

Priority:

Keywords:

InRadar

Version:

WebKit Nightly Build

Hardware:

Unspecified

OS:

Unspecified

Attachments:

Description	Flags
Patch	none
patch	ews-feeder: commit-queue-
patch	none
patch	achristensen: review+, ews-feeder: commit-queue-
Patch above for wpe&wkgtk compilation	none
Unified patch for landing	none

youenn fablet

Reported 2021-11-09 02:50:21 PST

Update libwebrtc to M96

Attachments
Patch (11.28 MB, patch) 2021-11-09 03:26 PST, youenn fablet	no flags	Details Formatted Diff Diff
patch (10.33 MB, patch) 2021-11-09 04:41 PST, youenn fablet	ews-feeder: commit-queue-	Details Formatted Diff Diff
patch (10.33 MB, patch) 2021-11-09 05:07 PST, youenn fablet	no flags	Details Formatted Diff Diff
patch (10.33 MB, patch) 2021-11-09 05:09 PST, youenn fablet	achristensen: review+ ews-feeder: commit-queue-	Details Formatted Diff Diff
Patch above for wpe&wkgtk compilation (10.43 KB, patch) 2021-11-10 06:12 PST, Víctor M. Jáquez L.	no flags	Details Formatted Diff Diff
Unified patch for landing (10.33 MB, patch) 2021-11-10 06:43 PST, youenn fablet	no flags	Details Formatted Diff Diff
Show Obsolete (5) View All Add attachment proposed patch, testcase, etc.

Radar WebKit Bug Importer

Comment 1 2021-11-09 03:21:22 PST

<rdar://problem/85196125>

youenn fablet

Comment 2 2021-11-09 03:26:04 PST

Created attachment 443673 [details] Patch

youenn fablet

Comment 3 2021-11-09 04:41:24 PST

Created attachment 443679 [details] patch

youenn fablet

Comment 4 2021-11-09 05:07:21 PST

Created attachment 443682 [details] patch

youenn fablet

Comment 5 2021-11-09 05:09:22 PST

Created attachment 443683 [details] patch

youenn fablet

Comment 6 2021-11-09 07:28:01 PST

@Victor or @Philn, could you take a look at libwebrtc CMakeLists.txt? It probably needs some updates.

Víctor M. Jáquez L.

Comment 7 2021-11-09 07:36:03 PST

(In reply to youenn fablet from comment #6) > @Victor or @Philn, could you take a look at libwebrtc CMakeLists.txt? It > probably needs some updates. Hi Youenn. I can take a look tomorrow morning, if that's ok for you.

youenn fablet

Comment 8 2021-11-09 08:08:05 PST

(In reply to Víctor M. Jáquez L. from comment #7) > (In reply to youenn fablet from comment #6) > > @Victor or @Philn, could you take a look at libwebrtc CMakeLists.txt? It > > probably needs some updates. > > Hi Youenn. I can take a look tomorrow morning, if that's ok for you. Sounds good, thanks!

youenn fablet

Comment 9 2021-11-09 08:20:47 PST

Comment on attachment 443683 [details] patch Putting review flag while waiting for gtk compilation fixes

Víctor M. Jáquez L.

Comment 10 2021-11-10 03:32:29 PST

I can compile now without errors no warnings, but I have a doubt: H264EncoderImpl now adds headers from OpenH264 for SVC. Shall I include third_party/openh264 completely or only those headers (they seem kind of self-contained)??

youenn fablet

Comment 11 2021-11-10 04:38:58 PST

(In reply to Víctor M. Jáquez L. from comment #10) > I can compile now without errors no warnings, but I have a doubt: > > H264EncoderImpl now adds headers from OpenH264 for SVC. Shall I include > third_party/openh264 completely or only those headers (they seem kind of > self-contained)?? That is a mistake, I missed a #if defined(WEBKIT_LIBWEBRTC_OPENH264_ENCODER) && WEBKIT_LIBWEBRTC_OPENH264_ENCODER change.

youenn fablet

Comment 12 2021-11-10 04:39:34 PST

Something like: +#if defined(WEBKIT_LIBWEBRTC_OPENH264_ENCODER) && WEBKIT_LIBWEBRTC_OPENH264_ENCODER +#include "wels/codec_api.h" +#include "wels/codec_app_def.h" +#include "wels/codec_def.h" +#include "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

Víctor M. Jáquez L.

Comment 13 2021-11-10 06:12:38 PST

Created attachment 443808 [details] Patch above for wpe&wkgtk compilation

youenn fablet

Comment 14 2021-11-10 06:43:50 PST

Created attachment 443812 [details] Unified patch for landing

youenn fablet

Comment 15 2021-11-10 06:45:43 PST

(In reply to youenn fablet from comment #12) > Something like: > +#if defined(WEBKIT_LIBWEBRTC_OPENH264_ENCODER) && > WEBKIT_LIBWEBRTC_OPENH264_ENCODER > +#include "wels/codec_api.h" > +#include "wels/codec_app_def.h" > +#include "wels/codec_def.h" > +#include "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 As a follow-up, I think we should add a "#if defined(WEBRTC_WEBKIT_BUILD)" to defined(WEBKIT_LIBWEBRTC_OPENH264_ENCODER) && WEBKIT_LIBWEBRTC_OPENH264_ENCODER. That will make sure I will not remove that change at next libwebrtc update.

EWS

Comment 16 2021-11-10 07:55:40 PST

Committed r285577 (244085@main): <https://commits.webkit.org/244085@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 443812 [details].

Brent Fulgham

Comment 17 2022-02-12 21:40:25 PST

*** Bug 231785 has been marked as a duplicate of this bug. ***

Note You need to log in before you can comment on or make changes to this bug.