Add support for AVC H264 WebCodecsVideoEncoder #5192
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
youennf
added
Media
|
EWS run on previous version of this PR (hash 0084e27)
|
webkit-ews-buildbot
added
the
merging-blocked
eric-carlson
approved these changes
Oct 11, 2022
...ce/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/components/video_codec/RTCVideoEncoderH265.mm
Outdated
Show resolved
Hide resolved
youennf
force-pushed
the
eng/Add-support-for-AVC-H264-WebCodecsVideoEncoder
branch
from
0084e27 to
86f2915
Compare
|
EWS run on previous version of this PR (hash 86f2915)
|
youennf
force-pushed
the
eng/Add-support-for-AVC-H264-WebCodecsVideoEncoder
branch
from
86f2915 to
cd244ef
Compare
|
EWS run on current version of this PR (hash cd244ef)
|
youennf
added
merge-queue
https://bugs.webkit.org/show_bug.cgi?id=246150 rdar://problem/100851081 Reviewed by Eric Carlson. Add support for AVC encoder in libwebrtc. Add support at WebKit layer by passing a boolean to set annexB or not, and a callback to get the description in case of AVC. Add support at WebCore level to provide the metadata in the output callback when needed. * LayoutTests/imported/w3c/web-platform-tests/webcodecs/full-cycle-test.https.any_h264_avc-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/webcodecs/reconfiguring-encoder.https.any.worker_h264_avc-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/webcodecs/reconfiguring-encoder.https.any_h264_avc-expected.txt: * Source/ThirdParty/libwebrtc/Configurations/libwebrtc.iOS.exp: * Source/ThirdParty/libwebrtc/Configurations/libwebrtc.iOSsim.exp: * Source/ThirdParty/libwebrtc/Configurations/libwebrtc.mac.exp: * Source/ThirdParty/libwebrtc/Source/webrtc/sdk/WebKit/WebKitEncoder.h: * Source/ThirdParty/libwebrtc/Source/webrtc/sdk/WebKit/WebKitEncoder.mm: (-[WK_RTCLocalVideoH264H265Encoder setUseAnnexB:]): (-[WK_RTCLocalVideoH264H265Encoder setDescriptionCallback:]): (webrtc::createLocalEncoder): * Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/base/RTCVideoEncoder.h: * Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/components/video_codec/RTCVideoEncoderH264.h: * Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/components/video_codec/RTCVideoEncoderH264.mm: (-[RTCVideoEncoderH264 initWithCodecInfo:]): (-[RTCVideoEncoderH264 setUseAnnexB:]): (-[RTCVideoEncoderH264 setDescriptionCallback:]): (-[RTCVideoEncoderH264 frameWasEncoded:flags:sampleBuffer:codecSpecificInfo:width:height:renderTimeMs:timestamp:rotation:isKeyFrameRequired:]): * Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/components/video_codec/RTCVideoEncoderH265.h: * Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/components/video_codec/RTCVideoEncoderH265.mm: (-[RTCVideoEncoderH265 initWithCodecInfo:]): (-[RTCVideoEncoderH265 setUseAnnexB:]): (-[RTCVideoEncoderH265 setDescriptionCallback:]): (-[RTCVideoEncoderH265 frameWasEncoded:flags:sampleBuffer:width:height:renderTimeMs:timestamp:rotation:]): * Source/WebCore/Modules/webcodecs/WebCodecsVideoEncoder.cpp: (WebCore::WebCodecsVideoEncoder::configure): (WebCore::WebCodecsVideoEncoder::createEncodedChunkMetadata): * Source/WebCore/Modules/webcodecs/WebCodecsVideoEncoder.h: * Source/WebCore/platform/LibWebRTCVPXVideoEncoder.cpp: (WebCore::LibWebRTCVPXVideoEncoder::LibWebRTCVPXVideoEncoder): * Source/WebCore/platform/LibWebRTCVPXVideoEncoder.h: * Source/WebCore/platform/VideoEncoder.cpp: (WebCore::VideoEncoder::create): (WebCore::VideoEncoder::createLocalEncoder): * Source/WebCore/platform/VideoEncoder.h: * Source/WebKit/Configurations/WebKit.xcconfig: * Source/WebKit/GPUProcess/webrtc/LibWebRTCCodecsProxy.h: * Source/WebKit/GPUProcess/webrtc/LibWebRTCCodecsProxy.messages.in: * Source/WebKit/GPUProcess/webrtc/LibWebRTCCodecsProxy.mm: (WebKit::LibWebRTCCodecsProxy::createEncoder): * Source/WebKit/WebProcess/GPU/media/RemoteVideoCodecFactory.cpp: (WebKit::RemoteVideoEncoderCallbacks::create): (WebKit::RemoteVideoCodecFactory::createEncoder): (WebKit::RemoteVideoDecoder::RemoteVideoDecoder): Deleted. (WebKit::RemoteVideoDecoder::~RemoteVideoDecoder): Deleted. (WebKit::RemoteVideoDecoder::decode): Deleted. (WebKit::RemoteVideoDecoder::flush): Deleted. (WebKit::RemoteVideoDecoder::reset): Deleted. (WebKit::RemoteVideoDecoder::close): Deleted. (WebKit::RemoteVideoDecoderCallbacks::RemoteVideoDecoderCallbacks): Deleted. (WebKit::RemoteVideoDecoderCallbacks::notifyVideoFrame): Deleted. (WebKit::RemoteVideoEncoder::RemoteVideoEncoder): Deleted. (WebKit::RemoteVideoEncoder::~RemoteVideoEncoder): Deleted. (WebKit::RemoteVideoEncoder::encode): Deleted. (WebKit::RemoteVideoEncoder::flush): Deleted. (WebKit::RemoteVideoEncoder::reset): Deleted. (WebKit::RemoteVideoEncoder::close): Deleted. (WebKit::RemoteVideoEncoderCallbacks::RemoteVideoEncoderCallbacks): Deleted. (WebKit::RemoteVideoEncoderCallbacks::notifyEncodedChunk): Deleted. * Source/WebKit/WebProcess/GPU/media/RemoteVideoCodecFactory.h: * Source/WebKit/WebProcess/GPU/webrtc/LibWebRTCCodecs.cpp: (WebKit::LibWebRTCCodecs::createEncoder): (WebKit::LibWebRTCCodecs::createEncoderAndWaitUntilReady): (WebKit::LibWebRTCCodecs::createEncoderInternal): (WebKit::LibWebRTCCodecs::registerEncoderDescriptionCallback): (WebKit::LibWebRTCCodecs::setEncodingDescription): (WebKit::LibWebRTCCodecs::gpuProcessConnectionDidClose): * Source/WebKit/WebProcess/GPU/webrtc/LibWebRTCCodecs.h: * Source/WebKit/WebProcess/GPU/webrtc/LibWebRTCCodecs.messages.in: Canonical link: https://commits.webkit.org/255430@main
webkit-commit-queue
force-pushed
the
eng/Add-support-for-AVC-H264-WebCodecsVideoEncoder
branch
from
cd244ef to
a591b26
Compare
|
Committed 255430@main (a591b26): https://commits.webkit.org/255430@main Reviewed commits have been landed. Closing PR #5192 and removing active labels. |
webkit-commit-queue
removed
the
merge-queue
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
a591b26
cd244ef
🛠 🧪 win🛠 wincairo🧪 api-ios🧪 api-mac🧪 api-gtk🧪 mac-wk1🧪 mac-wk2🧪 mac-AS-debug-wk2