From 8876b8ede5bc21d9f534bf53f59e62ecbc0a2703 Mon Sep 17 00:00:00 2001 From: Zenichi Amano Date: Tue, 31 Jan 2023 18:11:49 +0900 Subject: [PATCH] =?UTF-8?q?macOS/iOS=E7=94=A8=E3=81=AEh.264=E3=83=91?= =?UTF-8?q?=E3=83=83=E3=83=81=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/ios/Makefile | 3 --- build/macos-arm64/Makefile | 2 -- build/macos-x64/Makefile | 2 -- patch/macos_h264_encoder.patch | 15 --------------- 4 files changed, 22 deletions(-) delete mode 100644 patch/macos_h264_encoder.patch diff --git a/build/ios/Makefile b/build/ios/Makefile index 318057ea..d5a0c961 100644 --- a/build/ios/Makefile +++ b/build/ios/Makefile @@ -28,9 +28,6 @@ package: .PHONY: patch patch: common-patch - echo "apply iOS patches ..." && \ - cd $(SRC_DIR) && \ - patch -p2 < $(PATCH_DIR)/macos_h264_encoder.patch .PHONY: build build: patch diff --git a/build/macos-arm64/Makefile b/build/macos-arm64/Makefile index 6105f5c3..e086bec5 100644 --- a/build/macos-arm64/Makefile +++ b/build/macos-arm64/Makefile @@ -48,8 +48,6 @@ copy: common-copy .PHONY: patch patch: common-patch - cd $(SRC_DIR) && \ - patch -p2 < $(PATCH_DIR)/macos_h264_encoder.patch .PHONY: build build: patch diff --git a/build/macos-x64/Makefile b/build/macos-x64/Makefile index cd780610..50291645 100644 --- a/build/macos-x64/Makefile +++ b/build/macos-x64/Makefile @@ -48,8 +48,6 @@ copy: common-copy .PHONY: patch patch: common-patch - cd $(SRC_DIR) && \ - patch -p2 < $(PATCH_DIR)/macos_h264_encoder.patch .PHONY: build build: patch diff --git a/patch/macos_h264_encoder.patch b/patch/macos_h264_encoder.patch deleted file mode 100644 index 48349503..00000000 --- a/patch/macos_h264_encoder.patch +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 2018-2019, Shiguredo Inc, tnoho and melpon and kdxu -# from https://github.com/shiguredo/momo/blob/develop/patch/macos_h264_encoder.patch - -diff --git a/src/sdk/objc/components/video_codec/RTCVideoEncoderH264.mm b/src/sdk/objc/components/video_codec/RTCVideoEncoderH264.mm -index 4028e7acee..585743e1aa 100644 ---- a/src/sdk/objc/components/video_codec/RTCVideoEncoderH264.mm -+++ b/src/sdk/objc/components/video_codec/RTCVideoEncoderH264.mm -@@ -554,6 +554,7 @@ NSUInteger GetMaxSampleRate(const webrtc::H264::ProfileLevelId &profile_level_id - OSType framePixelFormat = [self pixelFormatOfFrame:frame]; - - if (_compressionSession) { -+ _pixelBufferPool = VTCompressionSessionGetPixelBufferPool(_compressionSession); - // The pool attribute `kCVPixelBufferPixelFormatTypeKey` can contain either an array of pixel - // formats or a single pixel format. - NSDictionary *poolAttributes =