Bug 232873 – Update libwebrtc to M96

• Status: RESOLVED
• Resolution: FIXED
• Component: WebRTC

[youenn fablet]

Update libwebrtc to M96

[Radar WebKit Bug Importer]

<rdar://problem/85196125>

[youenn fablet]

Created attachment 443673 [details]
Patch

[youenn fablet]

Created attachment 443679 [details]
patch

[youenn fablet]

Created attachment 443682 [details]
patch

[youenn fablet]

Created attachment 443683 [details]
patch

[youenn fablet]

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

[Víctor M. Jáquez L.]

(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]

(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 on attachment 443683 [details]
patch

Putting review flag while waiting for gtk compilation fixes

[Víctor M. Jáquez L.]

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]

(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]

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.]

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

[youenn fablet]

Created attachment 443812 [details]
Unified patch for landing

[youenn fablet]

(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]

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]

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