From 13fd0be5a9f50200aa9bab0c35199eb567155823 Mon Sep 17 00:00:00 2001 From: GIKI Date: Thu, 8 May 2025 14:37:34 +0800 Subject: [PATCH 1/3] fix: Add missing header file to resolve compilation issue --- source/redplayercore/redbase/include/RedDef.h | 1 + 1 file changed, 1 insertion(+) diff --git a/source/redplayercore/redbase/include/RedDef.h b/source/redplayercore/redbase/include/RedDef.h index 30c852d..15e36ee 100644 --- a/source/redplayercore/redbase/include/RedDef.h +++ b/source/redplayercore/redbase/include/RedDef.h @@ -9,6 +9,7 @@ #include "RedBase.h" #include #include +#include #define BUFFERING_CHECK_PER_MILLISECONDS (500) #define FAST_BUFFERING_CHECK_PER_MILLISECONDS (50) From e3d0e4fe831079b524ebcc31137599f8bf26ed05 Mon Sep 17 00:00:00 2001 From: GIKI Date: Thu, 8 May 2025 14:54:00 +0800 Subject: [PATCH 2/3] commit: update project --- source/ios/RedPlayerDemo/.gitignore | 70 +++++++++++++++---- source/ios/RedPlayerDemo/Podfile.lock | 23 ++++++ .../RedPlayerDemo.xcodeproj/project.pbxproj | 14 ++-- 3 files changed, 86 insertions(+), 21 deletions(-) create mode 100644 source/ios/RedPlayerDemo/Podfile.lock diff --git a/source/ios/RedPlayerDemo/.gitignore b/source/ios/RedPlayerDemo/.gitignore index 1c6ea88..f21d08c 100644 --- a/source/ios/RedPlayerDemo/.gitignore +++ b/source/ios/RedPlayerDemo/.gitignore @@ -1,6 +1,31 @@ +# CocoaPods +Pods +!Podfile +!Podfile.lock +*/build/* +*.xcworkspace +!default.xcworkspace +Pods*project.pbxproj + +#Octopusfile +Octopusfile_Customed + # Xcode +#*.xcodeproj/* +#!*.xcodeproj/xcshareddata +#!*.xcodeproj/xcshareddata/* +#!*.xcodeproj/project.pbxproj +#!*.xcworkspace/contents.xcworkspacedata +#!*.xcworkspace/xcshareddata # +# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore + +## Build generated build/ +DerivedData +xcodebuild.log + +## Various settings *.pbxuser !default.pbxuser *.mode1v3 @@ -10,29 +35,48 @@ build/ *.perspectivev3 !default.perspectivev3 xcuserdata +xcshareddata + +## Other *.xccheckout *.moved-aside -DerivedData +*.xcuserstate +*.xcscmblueprint + +## Obj-C/Swift specific *.hmap *.ipa -*.xcuserstate -.DS_Store -*.pyc -*.xcuserstate +*.app.dSYM.zip # CocoaPods # # We recommend against adding the Pods directory to your .gitignore. However # you should judge for yourself, the pros and cons are mentioned at: -# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control +# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control # -#Pods/ -Pods -Podfile.lock +# Pods/ -redPodDependencies/* +# Carthage +# +# Add this line if you want to avoid checking in source code from Carthage dependencies. +# Carthage/Checkouts + +Carthage/Build -# Idea project files +# fastlane +# +# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the +# screenshots whenever they are needed. +# For more information about the recommended setup visit: +# https://github.com/fastlane/fastlane/blob/master/docs/Gitignore.md + +fastlane/report.xml +fastlane/screenshots +# fastlane/.env + +# OS X +.DS_Store .idea -spacecommander/ -.clang-format + +**/.build + diff --git a/source/ios/RedPlayerDemo/Podfile.lock b/source/ios/RedPlayerDemo/Podfile.lock new file mode 100644 index 0000000..bc360aa --- /dev/null +++ b/source/ios/RedPlayerDemo/Podfile.lock @@ -0,0 +1,23 @@ +PODS: + - Masonry (1.1.0) + - XYMediaFfmpeg (0.0.2) + +DEPENDENCIES: + - Masonry + - XYMediaFfmpeg (from `../Submodules/XYMediaFfmpeg`) + +SPEC REPOS: + https://github.com/CocoaPods/Specs.git: + - Masonry + +EXTERNAL SOURCES: + XYMediaFfmpeg: + :path: "../Submodules/XYMediaFfmpeg" + +SPEC CHECKSUMS: + Masonry: 678fab65091a9290e40e2832a55e7ab731aad201 + XYMediaFfmpeg: f0acef8ccfec4697f5dcdc05fa44ab0a0790b3c2 + +PODFILE CHECKSUM: 4f7d36c61b827e7c631ee16b7ebd05bb50e17c83 + +COCOAPODS: 1.16.2 diff --git a/source/ios/RedPlayerDemo/RedPlayerDemo.xcodeproj/project.pbxproj b/source/ios/RedPlayerDemo/RedPlayerDemo.xcodeproj/project.pbxproj index ed40e6f..832ed7b 100644 --- a/source/ios/RedPlayerDemo/RedPlayerDemo.xcodeproj/project.pbxproj +++ b/source/ios/RedPlayerDemo/RedPlayerDemo.xcodeproj/project.pbxproj @@ -451,10 +451,10 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_CXX_LANGUAGE_STANDARD = "gnu++17"; CLANG_ENABLE_MODULES = YES; - CODE_SIGN_STYLE = Manual; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Automatic; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEVELOPMENT_TEAM = ""; - "DEVELOPMENT_TEAM[sdk=iphoneos*]" = P8WKNH5K7K; + DEVELOPMENT_TEAM = SK2369975P; EXCLUDED_ARCHS = "armv7 armv7s"; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; FRAMEWORK_SEARCH_PATHS = ( @@ -484,7 +484,6 @@ PRODUCT_BUNDLE_IDENTIFIER = com.xingin.RedPlayerDemo; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = debug_wildcard; REEXPORTED_LIBRARY_PATHS = ""; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OBJC_BRIDGING_HEADER = "RedPlayerDemo/RedPlayerDemo-Bridging-Header.h"; @@ -502,9 +501,9 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_CXX_LANGUAGE_STANDARD = "gnu++17"; CLANG_ENABLE_MODULES = YES; - CODE_SIGN_STYLE = Manual; - DEVELOPMENT_TEAM = ""; - "DEVELOPMENT_TEAM[sdk=iphoneos*]" = P8WKNH5K7K; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_TEAM = SK2369975P; EXCLUDED_ARCHS = "armv7 armv7s"; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; FRAMEWORK_SEARCH_PATHS = ( @@ -534,7 +533,6 @@ PRODUCT_BUNDLE_IDENTIFIER = com.xingin.RedPlayerDemo; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = debug_wildcard; REEXPORTED_LIBRARY_PATHS = ""; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OBJC_BRIDGING_HEADER = "RedPlayerDemo/RedPlayerDemo-Bridging-Header.h"; From 698307b8c9d1eed49512bf8b52ddfc1a5276f520 Mon Sep 17 00:00:00 2001 From: GIKI Date: Thu, 8 May 2025 15:46:31 +0800 Subject: [PATCH 3/3] Revert "commit: update project" This reverts commit e3d0e4fe831079b524ebcc31137599f8bf26ed05. --- source/ios/.DS_Store | Bin 0 -> 6148 bytes .../xcschemes/xcschememanagement.plist | 19 +++++ source/ios/RedPlayerDemo/.gitignore | 70 ++++-------------- source/ios/RedPlayerDemo/Podfile.lock | 23 ------ .../RedPlayerDemo.xcodeproj/project.pbxproj | 14 ++-- 5 files changed, 40 insertions(+), 86 deletions(-) create mode 100644 source/ios/.DS_Store create mode 100644 source/ios/RedPlayer.xcodeproj/xcuserdata/giki.xcuserdatad/xcschemes/xcschememanagement.plist delete mode 100644 source/ios/RedPlayerDemo/Podfile.lock diff --git a/source/ios/.DS_Store b/source/ios/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..bed72cddab3cec8466ac3a90657c0d13854a7adc GIT binary patch literal 6148 zcmeHKOG*SW5PhYyXmB&&#$`?*%njPHbuG>XbfyPo=pl_D=tlY|-ow31kKq;E`YIJ= z8hfD#B3cE>t4`|W^PrOy0GVFb6JQLWU{Mrx227g=yS8%hh$v}{2IsiN5?9zC80a@P z>DqU3$~D(G!RGpJus~$%5-s-=v1%?RvqfCDX&Xg2{ycLXt7_iFIT^*%-NVb_^W(u+ z*!4Hq?d9gG?>ViTE8q&a06w8dAVLCckr4)du z&*)_IHJ4CM$XI6V4B0~yqY{lOImHm8vpwXvGGk|GbVyD3MOE8q(JF$H8)&8jIkmG9OM+ta%?u$-}|X + + + + SchemeUserState + + RedPlayer.xcscheme_^#shared#^_ + + orderHint + 2 + + RedRenderShaders.xcscheme_^#shared#^_ + + orderHint + 5 + + + + diff --git a/source/ios/RedPlayerDemo/.gitignore b/source/ios/RedPlayerDemo/.gitignore index f21d08c..1c6ea88 100644 --- a/source/ios/RedPlayerDemo/.gitignore +++ b/source/ios/RedPlayerDemo/.gitignore @@ -1,31 +1,6 @@ -# CocoaPods -Pods -!Podfile -!Podfile.lock -*/build/* -*.xcworkspace -!default.xcworkspace -Pods*project.pbxproj - -#Octopusfile -Octopusfile_Customed - # Xcode -#*.xcodeproj/* -#!*.xcodeproj/xcshareddata -#!*.xcodeproj/xcshareddata/* -#!*.xcodeproj/project.pbxproj -#!*.xcworkspace/contents.xcworkspacedata -#!*.xcworkspace/xcshareddata # -# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore - -## Build generated build/ -DerivedData -xcodebuild.log - -## Various settings *.pbxuser !default.pbxuser *.mode1v3 @@ -35,48 +10,29 @@ xcodebuild.log *.perspectivev3 !default.perspectivev3 xcuserdata -xcshareddata - -## Other *.xccheckout *.moved-aside -*.xcuserstate -*.xcscmblueprint - -## Obj-C/Swift specific +DerivedData *.hmap *.ipa -*.app.dSYM.zip +*.xcuserstate +.DS_Store +*.pyc +*.xcuserstate # CocoaPods # # We recommend against adding the Pods directory to your .gitignore. However # you should judge for yourself, the pros and cons are mentioned at: -# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control -# -# Pods/ - -# Carthage +# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control # -# Add this line if you want to avoid checking in source code from Carthage dependencies. -# Carthage/Checkouts - -Carthage/Build - -# fastlane -# -# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the -# screenshots whenever they are needed. -# For more information about the recommended setup visit: -# https://github.com/fastlane/fastlane/blob/master/docs/Gitignore.md +#Pods/ +Pods +Podfile.lock -fastlane/report.xml -fastlane/screenshots -# fastlane/.env +redPodDependencies/* -# OS X -.DS_Store +# Idea project files .idea - -**/.build - +spacecommander/ +.clang-format diff --git a/source/ios/RedPlayerDemo/Podfile.lock b/source/ios/RedPlayerDemo/Podfile.lock deleted file mode 100644 index bc360aa..0000000 --- a/source/ios/RedPlayerDemo/Podfile.lock +++ /dev/null @@ -1,23 +0,0 @@ -PODS: - - Masonry (1.1.0) - - XYMediaFfmpeg (0.0.2) - -DEPENDENCIES: - - Masonry - - XYMediaFfmpeg (from `../Submodules/XYMediaFfmpeg`) - -SPEC REPOS: - https://github.com/CocoaPods/Specs.git: - - Masonry - -EXTERNAL SOURCES: - XYMediaFfmpeg: - :path: "../Submodules/XYMediaFfmpeg" - -SPEC CHECKSUMS: - Masonry: 678fab65091a9290e40e2832a55e7ab731aad201 - XYMediaFfmpeg: f0acef8ccfec4697f5dcdc05fa44ab0a0790b3c2 - -PODFILE CHECKSUM: 4f7d36c61b827e7c631ee16b7ebd05bb50e17c83 - -COCOAPODS: 1.16.2 diff --git a/source/ios/RedPlayerDemo/RedPlayerDemo.xcodeproj/project.pbxproj b/source/ios/RedPlayerDemo/RedPlayerDemo.xcodeproj/project.pbxproj index 832ed7b..ed40e6f 100644 --- a/source/ios/RedPlayerDemo/RedPlayerDemo.xcodeproj/project.pbxproj +++ b/source/ios/RedPlayerDemo/RedPlayerDemo.xcodeproj/project.pbxproj @@ -451,10 +451,10 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_CXX_LANGUAGE_STANDARD = "gnu++17"; CLANG_ENABLE_MODULES = YES; - CODE_SIGN_IDENTITY = "Apple Development"; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_STYLE = Manual; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEVELOPMENT_TEAM = SK2369975P; + DEVELOPMENT_TEAM = ""; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = P8WKNH5K7K; EXCLUDED_ARCHS = "armv7 armv7s"; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; FRAMEWORK_SEARCH_PATHS = ( @@ -484,6 +484,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.xingin.RedPlayerDemo; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = debug_wildcard; REEXPORTED_LIBRARY_PATHS = ""; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OBJC_BRIDGING_HEADER = "RedPlayerDemo/RedPlayerDemo-Bridging-Header.h"; @@ -501,9 +502,9 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_CXX_LANGUAGE_STANDARD = "gnu++17"; CLANG_ENABLE_MODULES = YES; - CODE_SIGN_IDENTITY = "Apple Development"; - CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = SK2369975P; + CODE_SIGN_STYLE = Manual; + DEVELOPMENT_TEAM = ""; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = P8WKNH5K7K; EXCLUDED_ARCHS = "armv7 armv7s"; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; FRAMEWORK_SEARCH_PATHS = ( @@ -533,6 +534,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.xingin.RedPlayerDemo; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = debug_wildcard; REEXPORTED_LIBRARY_PATHS = ""; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OBJC_BRIDGING_HEADER = "RedPlayerDemo/RedPlayerDemo-Bridging-Header.h";