diff --git a/README.md b/README.md index d36adfb..844940e 100644 --- a/README.md +++ b/README.md @@ -19,37 +19,38 @@ demonstrate how SAF uris can be used with `FFmpegKit`. Test applications are tagged with `ffmpeg-kit` release they depend on. -| Platform | FFmpegKit Version | Tag| -| :----: |:-----------------:|:----: | -| Android | 4.5.1 | [4.5.1](https://github.com/tanersener/ffmpeg-kit-test/tree/android.v4.5.1) | -| Android | 4.5.1.LTS | [4.5.1.LTS](https://github.com/tanersener/ffmpeg-kit-test/tree/android.v4.5.1.lts) | -| iOS | 4.5.1 | [4.5.1](https://github.com/tanersener/ffmpeg-kit-test/tree/ios.v4.5.1) | -| iOS | 4.5.1.LTS | [4.5.1.LTS](https://github.com/tanersener/ffmpeg-kit-test/tree/ios.v4.5.1.lts) | -| macOS | 4.5.1 | [4.5.1](https://github.com/tanersener/ffmpeg-kit-test/tree/macos.v4.5.1) | -| macOS | 4.5.1.LTS | [4.5.1.LTS](https://github.com/tanersener/ffmpeg-kit-test/tree/macos.v4.5.1.lts) | -| tvOS | 4.5.1 | [4.5.1](https://github.com/tanersener/ffmpeg-kit-test/tree/tvos.v4.5.1) | -| tvOS | 4.5.1.LTS | [4.5.1.LTS](https://github.com/tanersener/ffmpeg-kit-test/tree/tvos.v4.5.1.lts) | -| - | - | - | -| Flutter | 4.5.0 | [4.5.0](https://github.com/tanersener/ffmpeg-kit-test/tree/flutter.v4.5.0) | +| Platform | FFmpegKit Version | Tag | +| :----: |:-----------------:|:----------------------------------------------------------------------------------:| +| React Native | 4.5.1 | [4.5.1](https://github.com/tanersener/ffmpeg-kit-test/tree/react.native.v4.5.1) | +| Android | 4.5.1 | [4.5.1](https://github.com/tanersener/ffmpeg-kit-test/tree/android.v4.5.1) | +| Android | 4.5.1.LTS | [4.5.1.LTS](https://github.com/tanersener/ffmpeg-kit-test/tree/android.v4.5.1.lts) | +| iOS | 4.5.1 | [4.5.1](https://github.com/tanersener/ffmpeg-kit-test/tree/ios.v4.5.1) | +| iOS | 4.5.1.LTS | [4.5.1.LTS](https://github.com/tanersener/ffmpeg-kit-test/tree/ios.v4.5.1.lts) | +| macOS | 4.5.1 | [4.5.1](https://github.com/tanersener/ffmpeg-kit-test/tree/macos.v4.5.1) | +| macOS | 4.5.1.LTS | [4.5.1.LTS](https://github.com/tanersener/ffmpeg-kit-test/tree/macos.v4.5.1.lts) | +| tvOS | 4.5.1 | [4.5.1](https://github.com/tanersener/ffmpeg-kit-test/tree/tvos.v4.5.1) | +| tvOS | 4.5.1.LTS | [4.5.1.LTS](https://github.com/tanersener/ffmpeg-kit-test/tree/tvos.v4.5.1.lts) | +| - | - | - | +| Flutter | 4.5.0 | [4.5.0](https://github.com/tanersener/ffmpeg-kit-test/tree/flutter.v4.5.0) | | Flutter | 4.5.0-LTS | [4.5.0-LTS](https://github.com/tanersener/ffmpeg-kit-test/tree/flutter.v4.5.0.lts) | -| React Native | 4.5.0 | [4.5.0](https://github.com/tanersener/ffmpeg-kit-test/tree/react.native.v4.5.0) | -| Android | 4.5 | [4.5](https://github.com/tanersener/ffmpeg-kit-test/tree/android.v4.5) | -| Android | 4.5.LTS | [4.5.LTS](https://github.com/tanersener/ffmpeg-kit-test/tree/android.v4.5.lts) | -| iOS | 4.5 | [4.5](https://github.com/tanersener/ffmpeg-kit-test/tree/ios.v4.5) | -| iOS | 4.5.LTS | [4.5.LTS](https://github.com/tanersener/ffmpeg-kit-test/tree/ios.v4.5.lts) | -| macOS | 4.5 | [4.5](https://github.com/tanersener/ffmpeg-kit-test/tree/macos.v4.5) | -| macOS | 4.5.LTS | [4.5.LTS](https://github.com/tanersener/ffmpeg-kit-test/tree/macos.v4.5.lts) | -| tvOS | 4.5 | [4.5](https://github.com/tanersener/ffmpeg-kit-test/tree/tvos.v4.5) | -| tvOS | 4.5.LTS | [4.5.LTS](https://github.com/tanersener/ffmpeg-kit-test/tree/tvos.v4.5.lts) | -| - | - | - | -| Android | 4.4 | [4.4](https://github.com/tanersener/ffmpeg-kit-test/tree/android.v4.4) | -| Android | 4.4.LTS | [4.4.LTS](https://github.com/tanersener/ffmpeg-kit-test/tree/android.v4.4.lts) | -| iOS | 4.4 | [4.4](https://github.com/tanersener/ffmpeg-kit-test/tree/ios.v4.4) | -| iOS | 4.4.LTS | [4.4.LTS](https://github.com/tanersener/ffmpeg-kit-test/tree/ios.v4.4.lts) | -| macOS | 4.4 | [4.4](https://github.com/tanersener/ffmpeg-kit-test/tree/macos.v4.4) | -| macOS | 4.4.LTS | [4.4.LTS](https://github.com/tanersener/ffmpeg-kit-test/tree/macos.v4.4.lts) | -| tvOS | 4.4 | [4.4](https://github.com/tanersener/ffmpeg-kit-test/tree/tvos.v4.4) | -| tvOS | 4.4.LTS | [4.4.LTS](https://github.com/tanersener/ffmpeg-kit-test/tree/tvos.v4.4.lts) | +| React Native | 4.5.0 | [4.5.0](https://github.com/tanersener/ffmpeg-kit-test/tree/react.native.v4.5.0) | +| Android | 4.5 | [4.5](https://github.com/tanersener/ffmpeg-kit-test/tree/android.v4.5) | +| Android | 4.5.LTS | [4.5.LTS](https://github.com/tanersener/ffmpeg-kit-test/tree/android.v4.5.lts) | +| iOS | 4.5 | [4.5](https://github.com/tanersener/ffmpeg-kit-test/tree/ios.v4.5) | +| iOS | 4.5.LTS | [4.5.LTS](https://github.com/tanersener/ffmpeg-kit-test/tree/ios.v4.5.lts) | +| macOS | 4.5 | [4.5](https://github.com/tanersener/ffmpeg-kit-test/tree/macos.v4.5) | +| macOS | 4.5.LTS | [4.5.LTS](https://github.com/tanersener/ffmpeg-kit-test/tree/macos.v4.5.lts) | +| tvOS | 4.5 | [4.5](https://github.com/tanersener/ffmpeg-kit-test/tree/tvos.v4.5) | +| tvOS | 4.5.LTS | [4.5.LTS](https://github.com/tanersener/ffmpeg-kit-test/tree/tvos.v4.5.lts) | +| - | - | - | +| Android | 4.4 | [4.4](https://github.com/tanersener/ffmpeg-kit-test/tree/android.v4.4) | +| Android | 4.4.LTS | [4.4.LTS](https://github.com/tanersener/ffmpeg-kit-test/tree/android.v4.4.lts) | +| iOS | 4.4 | [4.4](https://github.com/tanersener/ffmpeg-kit-test/tree/ios.v4.4) | +| iOS | 4.4.LTS | [4.4.LTS](https://github.com/tanersener/ffmpeg-kit-test/tree/ios.v4.4.lts) | +| macOS | 4.4 | [4.4](https://github.com/tanersener/ffmpeg-kit-test/tree/macos.v4.4) | +| macOS | 4.4.LTS | [4.4.LTS](https://github.com/tanersener/ffmpeg-kit-test/tree/macos.v4.4.lts) | +| tvOS | 4.4 | [4.4](https://github.com/tanersener/ffmpeg-kit-test/tree/tvos.v4.4) | +| tvOS | 4.4.LTS | [4.4.LTS](https://github.com/tanersener/ffmpeg-kit-test/tree/tvos.v4.4.lts) | ### License diff --git a/react-native/test-app-local-dependency/ios/FFmpegKitReactNative.xcodeproj/project.pbxproj b/react-native/test-app-local-dependency/ios/FFmpegKitReactNative.xcodeproj/project.pbxproj index 9a1437f..f1c33f8 100644 --- a/react-native/test-app-local-dependency/ios/FFmpegKitReactNative.xcodeproj/project.pbxproj +++ b/react-native/test-app-local-dependency/ios/FFmpegKitReactNative.xcodeproj/project.pbxproj @@ -323,6 +323,10 @@ "$(inherited)", "@executable_path/Frameworks", ); + LIBRARY_SEARCH_PATHS = ( + "$(SDKROOT)/usr/lib/swift", + "$(inherited)", + ); OTHER_CODE_SIGN_FLAGS = "--deep"; OTHER_LDFLAGS = ( "$(inherited)", @@ -350,6 +354,10 @@ "$(inherited)", "@executable_path/Frameworks", ); + LIBRARY_SEARCH_PATHS = ( + "$(SDKROOT)/usr/lib/swift", + "$(inherited)", + ); OTHER_CODE_SIGN_FLAGS = "--deep"; OTHER_LDFLAGS = ( "$(inherited)", @@ -396,7 +404,7 @@ COPY_PHASE_STRIP = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; - "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 "; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = ""; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -461,7 +469,7 @@ COPY_PHASE_STRIP = YES; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 "; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = ""; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; diff --git a/react-native/test-app-local-dependency/ios/FFmpegKitReactNative/Images.xcassets/AppIcon.appiconset/Contents.json b/react-native/test-app-local-dependency/ios/FFmpegKitReactNative/Images.xcassets/AppIcon.appiconset/Contents.json index 8121323..0cc2196 100644 --- a/react-native/test-app-local-dependency/ios/FFmpegKitReactNative/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/react-native/test-app-local-dependency/ios/FFmpegKitReactNative/Images.xcassets/AppIcon.appiconset/Contents.json @@ -1,53 +1,116 @@ { "images" : [ { + "size" : "20x20", "idiom" : "iphone", - "scale" : "2x", - "size" : "20x20" + "filename" : "Icon-40.png", + "scale" : "2x" }, { + "size" : "20x20", "idiom" : "iphone", - "scale" : "3x", - "size" : "20x20" + "filename" : "Icon-60.png", + "scale" : "3x" }, { + "size" : "29x29", "idiom" : "iphone", - "scale" : "2x", - "size" : "29x29" + "filename" : "Icon-58.png", + "scale" : "2x" }, { + "size" : "29x29", "idiom" : "iphone", - "scale" : "3x", - "size" : "29x29" + "filename" : "Icon-87.png", + "scale" : "3x" }, { + "size" : "40x40", "idiom" : "iphone", - "scale" : "2x", - "size" : "40x40" + "filename" : "Icon-80.png", + "scale" : "2x" }, { + "size" : "40x40", "idiom" : "iphone", - "scale" : "3x", - "size" : "40x40" + "filename" : "Icon-120.png", + "scale" : "3x" }, { + "size" : "60x60", "idiom" : "iphone", - "scale" : "2x", - "size" : "60x60" + "filename" : "Icon-121.png", + "scale" : "2x" }, { + "size" : "60x60", "idiom" : "iphone", - "scale" : "3x", - "size" : "60x60" + "filename" : "Icon-180.png", + "scale" : "3x" }, { + "size" : "20x20", + "idiom" : "ipad", + "filename" : "Icon-20.png", + "scale" : "1x" + }, + { + "size" : "20x20", + "idiom" : "ipad", + "filename" : "Icon-41.png", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "Icon-29.png", + "scale" : "1x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "Icon-59.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "Icon-42.png", + "scale" : "1x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "Icon-81.png", + "scale" : "2x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "Icon-76.png", + "scale" : "1x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "Icon-152.png", + "scale" : "2x" + }, + { + "size" : "83.5x83.5", + "idiom" : "ipad", + "filename" : "Icon-167.png", + "scale" : "2x" + }, + { + "size" : "1024x1024", "idiom" : "ios-marketing", - "scale" : "1x", - "size" : "1024x1024" + "filename" : "Icon-1024.png", + "scale" : "1x" } ], "info" : { - "author" : "xcode", - "version" : 1 + "version" : 1, + "author" : "xcode" } -} +} \ No newline at end of file diff --git a/react-native/test-app-local-dependency/ios/FFmpegKitReactNative/Images.xcassets/AppIcon.appiconset/Icon-1024.png b/react-native/test-app-local-dependency/ios/FFmpegKitReactNative/Images.xcassets/AppIcon.appiconset/Icon-1024.png new file mode 100644 index 0000000..1eb1263 Binary files /dev/null and b/react-native/test-app-local-dependency/ios/FFmpegKitReactNative/Images.xcassets/AppIcon.appiconset/Icon-1024.png differ diff --git a/react-native/test-app-local-dependency/ios/FFmpegKitReactNative/Images.xcassets/AppIcon.appiconset/Icon-120.png b/react-native/test-app-local-dependency/ios/FFmpegKitReactNative/Images.xcassets/AppIcon.appiconset/Icon-120.png new file mode 100644 index 0000000..44174f6 Binary files /dev/null and b/react-native/test-app-local-dependency/ios/FFmpegKitReactNative/Images.xcassets/AppIcon.appiconset/Icon-120.png differ diff --git a/react-native/test-app-local-dependency/ios/FFmpegKitReactNative/Images.xcassets/AppIcon.appiconset/Icon-121.png b/react-native/test-app-local-dependency/ios/FFmpegKitReactNative/Images.xcassets/AppIcon.appiconset/Icon-121.png new file mode 100644 index 0000000..44174f6 Binary files /dev/null and b/react-native/test-app-local-dependency/ios/FFmpegKitReactNative/Images.xcassets/AppIcon.appiconset/Icon-121.png differ diff --git a/react-native/test-app-local-dependency/ios/FFmpegKitReactNative/Images.xcassets/AppIcon.appiconset/Icon-152.png b/react-native/test-app-local-dependency/ios/FFmpegKitReactNative/Images.xcassets/AppIcon.appiconset/Icon-152.png new file mode 100644 index 0000000..c2433a2 Binary files /dev/null and b/react-native/test-app-local-dependency/ios/FFmpegKitReactNative/Images.xcassets/AppIcon.appiconset/Icon-152.png differ diff --git a/react-native/test-app-local-dependency/ios/FFmpegKitReactNative/Images.xcassets/AppIcon.appiconset/Icon-167.png b/react-native/test-app-local-dependency/ios/FFmpegKitReactNative/Images.xcassets/AppIcon.appiconset/Icon-167.png new file mode 100644 index 0000000..f1714c5 Binary files /dev/null and b/react-native/test-app-local-dependency/ios/FFmpegKitReactNative/Images.xcassets/AppIcon.appiconset/Icon-167.png differ diff --git a/react-native/test-app-local-dependency/ios/FFmpegKitReactNative/Images.xcassets/AppIcon.appiconset/Icon-180.png b/react-native/test-app-local-dependency/ios/FFmpegKitReactNative/Images.xcassets/AppIcon.appiconset/Icon-180.png new file mode 100644 index 0000000..5d9ce57 Binary files /dev/null and b/react-native/test-app-local-dependency/ios/FFmpegKitReactNative/Images.xcassets/AppIcon.appiconset/Icon-180.png differ diff --git a/react-native/test-app-local-dependency/ios/FFmpegKitReactNative/Images.xcassets/AppIcon.appiconset/Icon-20.png b/react-native/test-app-local-dependency/ios/FFmpegKitReactNative/Images.xcassets/AppIcon.appiconset/Icon-20.png new file mode 100644 index 0000000..e757044 Binary files /dev/null and b/react-native/test-app-local-dependency/ios/FFmpegKitReactNative/Images.xcassets/AppIcon.appiconset/Icon-20.png differ diff --git a/react-native/test-app-local-dependency/ios/FFmpegKitReactNative/Images.xcassets/AppIcon.appiconset/Icon-29.png b/react-native/test-app-local-dependency/ios/FFmpegKitReactNative/Images.xcassets/AppIcon.appiconset/Icon-29.png new file mode 100644 index 0000000..eb0dd0a Binary files /dev/null and b/react-native/test-app-local-dependency/ios/FFmpegKitReactNative/Images.xcassets/AppIcon.appiconset/Icon-29.png differ diff --git a/react-native/test-app-local-dependency/ios/FFmpegKitReactNative/Images.xcassets/AppIcon.appiconset/Icon-40.png b/react-native/test-app-local-dependency/ios/FFmpegKitReactNative/Images.xcassets/AppIcon.appiconset/Icon-40.png new file mode 100644 index 0000000..784e8f6 Binary files /dev/null and b/react-native/test-app-local-dependency/ios/FFmpegKitReactNative/Images.xcassets/AppIcon.appiconset/Icon-40.png differ diff --git a/react-native/test-app-local-dependency/ios/FFmpegKitReactNative/Images.xcassets/AppIcon.appiconset/Icon-41.png b/react-native/test-app-local-dependency/ios/FFmpegKitReactNative/Images.xcassets/AppIcon.appiconset/Icon-41.png new file mode 100644 index 0000000..784e8f6 Binary files /dev/null and b/react-native/test-app-local-dependency/ios/FFmpegKitReactNative/Images.xcassets/AppIcon.appiconset/Icon-41.png differ diff --git a/react-native/test-app-local-dependency/ios/FFmpegKitReactNative/Images.xcassets/AppIcon.appiconset/Icon-42.png b/react-native/test-app-local-dependency/ios/FFmpegKitReactNative/Images.xcassets/AppIcon.appiconset/Icon-42.png new file mode 100644 index 0000000..784e8f6 Binary files /dev/null and b/react-native/test-app-local-dependency/ios/FFmpegKitReactNative/Images.xcassets/AppIcon.appiconset/Icon-42.png differ diff --git a/react-native/test-app-local-dependency/ios/FFmpegKitReactNative/Images.xcassets/AppIcon.appiconset/Icon-58.png b/react-native/test-app-local-dependency/ios/FFmpegKitReactNative/Images.xcassets/AppIcon.appiconset/Icon-58.png new file mode 100644 index 0000000..f87c4f7 Binary files /dev/null and b/react-native/test-app-local-dependency/ios/FFmpegKitReactNative/Images.xcassets/AppIcon.appiconset/Icon-58.png differ diff --git a/react-native/test-app-local-dependency/ios/FFmpegKitReactNative/Images.xcassets/AppIcon.appiconset/Icon-59.png b/react-native/test-app-local-dependency/ios/FFmpegKitReactNative/Images.xcassets/AppIcon.appiconset/Icon-59.png new file mode 100644 index 0000000..f87c4f7 Binary files /dev/null and b/react-native/test-app-local-dependency/ios/FFmpegKitReactNative/Images.xcassets/AppIcon.appiconset/Icon-59.png differ diff --git a/react-native/test-app-local-dependency/ios/FFmpegKitReactNative/Images.xcassets/AppIcon.appiconset/Icon-60.png b/react-native/test-app-local-dependency/ios/FFmpegKitReactNative/Images.xcassets/AppIcon.appiconset/Icon-60.png new file mode 100644 index 0000000..104e427 Binary files /dev/null and b/react-native/test-app-local-dependency/ios/FFmpegKitReactNative/Images.xcassets/AppIcon.appiconset/Icon-60.png differ diff --git a/react-native/test-app-local-dependency/ios/FFmpegKitReactNative/Images.xcassets/AppIcon.appiconset/Icon-76.png b/react-native/test-app-local-dependency/ios/FFmpegKitReactNative/Images.xcassets/AppIcon.appiconset/Icon-76.png new file mode 100644 index 0000000..23ff54e Binary files /dev/null and b/react-native/test-app-local-dependency/ios/FFmpegKitReactNative/Images.xcassets/AppIcon.appiconset/Icon-76.png differ diff --git a/react-native/test-app-local-dependency/ios/FFmpegKitReactNative/Images.xcassets/AppIcon.appiconset/Icon-80.png b/react-native/test-app-local-dependency/ios/FFmpegKitReactNative/Images.xcassets/AppIcon.appiconset/Icon-80.png new file mode 100644 index 0000000..65ae9e3 Binary files /dev/null and b/react-native/test-app-local-dependency/ios/FFmpegKitReactNative/Images.xcassets/AppIcon.appiconset/Icon-80.png differ diff --git a/react-native/test-app-local-dependency/ios/FFmpegKitReactNative/Images.xcassets/AppIcon.appiconset/Icon-81.png b/react-native/test-app-local-dependency/ios/FFmpegKitReactNative/Images.xcassets/AppIcon.appiconset/Icon-81.png new file mode 100644 index 0000000..65ae9e3 Binary files /dev/null and b/react-native/test-app-local-dependency/ios/FFmpegKitReactNative/Images.xcassets/AppIcon.appiconset/Icon-81.png differ diff --git a/react-native/test-app-local-dependency/ios/FFmpegKitReactNative/Images.xcassets/AppIcon.appiconset/Icon-87.png b/react-native/test-app-local-dependency/ios/FFmpegKitReactNative/Images.xcassets/AppIcon.appiconset/Icon-87.png new file mode 100644 index 0000000..5972ed6 Binary files /dev/null and b/react-native/test-app-local-dependency/ios/FFmpegKitReactNative/Images.xcassets/AppIcon.appiconset/Icon-87.png differ diff --git a/react-native/test-app-local-dependency/ios/Podfile b/react-native/test-app-local-dependency/ios/Podfile index a9d8485..25f9f13 100644 --- a/react-native/test-app-local-dependency/ios/Podfile +++ b/react-native/test-app-local-dependency/ios/Podfile @@ -23,5 +23,14 @@ target 'FFmpegKitReactNative' do post_install do |installer| react_native_post_install(installer) + + installer.aggregate_targets.each do |aggregate_target| + aggregate_target.user_project.native_targets.each do |target| + target.build_configurations.each do |config| + config.build_settings['LIBRARY_SEARCH_PATHS'] = ['$(SDKROOT)/usr/lib/swift', '$(inherited)'] + end + end + aggregate_target.user_project.save + end end end diff --git a/react-native/test-app-local-dependency/ios/Podfile.lock b/react-native/test-app-local-dependency/ios/Podfile.lock index ae87c78..7fc3201 100644 --- a/react-native/test-app-local-dependency/ios/Podfile.lock +++ b/react-native/test-app-local-dependency/ios/Podfile.lock @@ -1,20 +1,20 @@ PODS: - - boost-for-react-native (1.63.0) + - boost (1.76.0) - CocoaAsyncSocket (7.6.5) - DoubleConversion (1.1.6) - - FBLazyVector (0.65.1) - - FBReactNativeSpec (0.65.1): - - RCT-Folly (= 2021.04.26.00) - - RCTRequired (= 0.65.1) - - RCTTypeSafety (= 0.65.1) - - React-Core (= 0.65.1) - - React-jsi (= 0.65.1) - - ReactCommon/turbomodule/core (= 0.65.1) - - ffmpeg-kit-ios-video (4.5) - - ffmpeg-kit-react-native/video (4.5.0): - - ffmpeg-kit-ios-video (= 4.5) + - FBLazyVector (0.66.4) + - FBReactNativeSpec (0.66.4): + - RCT-Folly (= 2021.06.28.00-v2) + - RCTRequired (= 0.66.4) + - RCTTypeSafety (= 0.66.4) + - React-Core (= 0.66.4) + - React-jsi (= 0.66.4) + - ReactCommon/turbomodule/core (= 0.66.4) + - ffmpeg-kit-ios-video (4.5.1) + - ffmpeg-kit-react-native/video (4.5.1): + - ffmpeg-kit-ios-video (= 4.5.1) - React-Core - - Flipper (0.93.0): + - Flipper (0.99.0): - Flipper-Folly (~> 2.6) - Flipper-RSocket (~> 1.4) - Flipper-Boost-iOSX (1.76.0.1.11) @@ -31,318 +31,322 @@ PODS: - Flipper-PeerTalk (0.0.4) - Flipper-RSocket (1.4.3): - Flipper-Folly (~> 2.6) - - FlipperKit (0.93.0): - - FlipperKit/Core (= 0.93.0) - - FlipperKit/Core (0.93.0): - - Flipper (~> 0.93.0) + - FlipperKit (0.99.0): + - FlipperKit/Core (= 0.99.0) + - FlipperKit/Core (0.99.0): + - Flipper (~> 0.99.0) - FlipperKit/CppBridge - FlipperKit/FBCxxFollyDynamicConvert - FlipperKit/FBDefines - FlipperKit/FKPortForwarding - - FlipperKit/CppBridge (0.93.0): - - Flipper (~> 0.93.0) - - FlipperKit/FBCxxFollyDynamicConvert (0.93.0): + - FlipperKit/CppBridge (0.99.0): + - Flipper (~> 0.99.0) + - FlipperKit/FBCxxFollyDynamicConvert (0.99.0): - Flipper-Folly (~> 2.6) - - FlipperKit/FBDefines (0.93.0) - - FlipperKit/FKPortForwarding (0.93.0): + - FlipperKit/FBDefines (0.99.0) + - FlipperKit/FKPortForwarding (0.99.0): - CocoaAsyncSocket (~> 7.6) - Flipper-PeerTalk (~> 0.0.4) - - FlipperKit/FlipperKitHighlightOverlay (0.93.0) - - FlipperKit/FlipperKitLayoutHelpers (0.93.0): + - FlipperKit/FlipperKitHighlightOverlay (0.99.0) + - FlipperKit/FlipperKitLayoutHelpers (0.99.0): - FlipperKit/Core - FlipperKit/FlipperKitHighlightOverlay - FlipperKit/FlipperKitLayoutTextSearchable - - FlipperKit/FlipperKitLayoutIOSDescriptors (0.93.0): + - FlipperKit/FlipperKitLayoutIOSDescriptors (0.99.0): - FlipperKit/Core - FlipperKit/FlipperKitHighlightOverlay - FlipperKit/FlipperKitLayoutHelpers - YogaKit (~> 1.18) - - FlipperKit/FlipperKitLayoutPlugin (0.93.0): + - FlipperKit/FlipperKitLayoutPlugin (0.99.0): - FlipperKit/Core - FlipperKit/FlipperKitHighlightOverlay - FlipperKit/FlipperKitLayoutHelpers - FlipperKit/FlipperKitLayoutIOSDescriptors - FlipperKit/FlipperKitLayoutTextSearchable - YogaKit (~> 1.18) - - FlipperKit/FlipperKitLayoutTextSearchable (0.93.0) - - FlipperKit/FlipperKitNetworkPlugin (0.93.0): + - FlipperKit/FlipperKitLayoutTextSearchable (0.99.0) + - FlipperKit/FlipperKitNetworkPlugin (0.99.0): - FlipperKit/Core - - FlipperKit/FlipperKitReactPlugin (0.93.0): + - FlipperKit/FlipperKitReactPlugin (0.99.0): - FlipperKit/Core - - FlipperKit/FlipperKitUserDefaultsPlugin (0.93.0): + - FlipperKit/FlipperKitUserDefaultsPlugin (0.99.0): - FlipperKit/Core - - FlipperKit/SKIOSNetworkPlugin (0.93.0): + - FlipperKit/SKIOSNetworkPlugin (0.99.0): - FlipperKit/Core - FlipperKit/FlipperKitNetworkPlugin - fmt (6.2.1) - glog (0.3.5) - libevent (2.1.12) - OpenSSL-Universal (1.1.180) - - RCT-Folly (2021.04.26.00): - - boost-for-react-native + - RCT-Folly (2021.06.28.00-v2): + - boost - DoubleConversion - fmt (~> 6.2.1) - glog - - RCT-Folly/Default (= 2021.04.26.00) - - RCT-Folly/Default (2021.04.26.00): - - boost-for-react-native + - RCT-Folly/Default (= 2021.06.28.00-v2) + - RCT-Folly/Default (2021.06.28.00-v2): + - boost - DoubleConversion - fmt (~> 6.2.1) - glog - - RCTRequired (0.65.1) - - RCTTypeSafety (0.65.1): - - FBLazyVector (= 0.65.1) - - RCT-Folly (= 2021.04.26.00) - - RCTRequired (= 0.65.1) - - React-Core (= 0.65.1) - - React (0.65.1): - - React-Core (= 0.65.1) - - React-Core/DevSupport (= 0.65.1) - - React-Core/RCTWebSocket (= 0.65.1) - - React-RCTActionSheet (= 0.65.1) - - React-RCTAnimation (= 0.65.1) - - React-RCTBlob (= 0.65.1) - - React-RCTImage (= 0.65.1) - - React-RCTLinking (= 0.65.1) - - React-RCTNetwork (= 0.65.1) - - React-RCTSettings (= 0.65.1) - - React-RCTText (= 0.65.1) - - React-RCTVibration (= 0.65.1) - - React-callinvoker (0.65.1) - - React-Core (0.65.1): + - RCTRequired (0.66.4) + - RCTTypeSafety (0.66.4): + - FBLazyVector (= 0.66.4) + - RCT-Folly (= 2021.06.28.00-v2) + - RCTRequired (= 0.66.4) + - React-Core (= 0.66.4) + - React (0.66.4): + - React-Core (= 0.66.4) + - React-Core/DevSupport (= 0.66.4) + - React-Core/RCTWebSocket (= 0.66.4) + - React-RCTActionSheet (= 0.66.4) + - React-RCTAnimation (= 0.66.4) + - React-RCTBlob (= 0.66.4) + - React-RCTImage (= 0.66.4) + - React-RCTLinking (= 0.66.4) + - React-RCTNetwork (= 0.66.4) + - React-RCTSettings (= 0.66.4) + - React-RCTText (= 0.66.4) + - React-RCTVibration (= 0.66.4) + - React-callinvoker (0.66.4) + - React-Core (0.66.4): - glog - - RCT-Folly (= 2021.04.26.00) - - React-Core/Default (= 0.65.1) - - React-cxxreact (= 0.65.1) - - React-jsi (= 0.65.1) - - React-jsiexecutor (= 0.65.1) - - React-perflogger (= 0.65.1) + - RCT-Folly (= 2021.06.28.00-v2) + - React-Core/Default (= 0.66.4) + - React-cxxreact (= 0.66.4) + - React-jsi (= 0.66.4) + - React-jsiexecutor (= 0.66.4) + - React-perflogger (= 0.66.4) - Yoga - - React-Core/CoreModulesHeaders (0.65.1): + - React-Core/CoreModulesHeaders (0.66.4): - glog - - RCT-Folly (= 2021.04.26.00) + - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.65.1) - - React-jsi (= 0.65.1) - - React-jsiexecutor (= 0.65.1) - - React-perflogger (= 0.65.1) + - React-cxxreact (= 0.66.4) + - React-jsi (= 0.66.4) + - React-jsiexecutor (= 0.66.4) + - React-perflogger (= 0.66.4) - Yoga - - React-Core/Default (0.65.1): + - React-Core/Default (0.66.4): - glog - - RCT-Folly (= 2021.04.26.00) - - React-cxxreact (= 0.65.1) - - React-jsi (= 0.65.1) - - React-jsiexecutor (= 0.65.1) - - React-perflogger (= 0.65.1) + - RCT-Folly (= 2021.06.28.00-v2) + - React-cxxreact (= 0.66.4) + - React-jsi (= 0.66.4) + - React-jsiexecutor (= 0.66.4) + - React-perflogger (= 0.66.4) - Yoga - - React-Core/DevSupport (0.65.1): + - React-Core/DevSupport (0.66.4): - glog - - RCT-Folly (= 2021.04.26.00) - - React-Core/Default (= 0.65.1) - - React-Core/RCTWebSocket (= 0.65.1) - - React-cxxreact (= 0.65.1) - - React-jsi (= 0.65.1) - - React-jsiexecutor (= 0.65.1) - - React-jsinspector (= 0.65.1) - - React-perflogger (= 0.65.1) + - RCT-Folly (= 2021.06.28.00-v2) + - React-Core/Default (= 0.66.4) + - React-Core/RCTWebSocket (= 0.66.4) + - React-cxxreact (= 0.66.4) + - React-jsi (= 0.66.4) + - React-jsiexecutor (= 0.66.4) + - React-jsinspector (= 0.66.4) + - React-perflogger (= 0.66.4) - Yoga - - React-Core/RCTActionSheetHeaders (0.65.1): + - React-Core/RCTActionSheetHeaders (0.66.4): - glog - - RCT-Folly (= 2021.04.26.00) + - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.65.1) - - React-jsi (= 0.65.1) - - React-jsiexecutor (= 0.65.1) - - React-perflogger (= 0.65.1) + - React-cxxreact (= 0.66.4) + - React-jsi (= 0.66.4) + - React-jsiexecutor (= 0.66.4) + - React-perflogger (= 0.66.4) - Yoga - - React-Core/RCTAnimationHeaders (0.65.1): + - React-Core/RCTAnimationHeaders (0.66.4): - glog - - RCT-Folly (= 2021.04.26.00) + - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.65.1) - - React-jsi (= 0.65.1) - - React-jsiexecutor (= 0.65.1) - - React-perflogger (= 0.65.1) + - React-cxxreact (= 0.66.4) + - React-jsi (= 0.66.4) + - React-jsiexecutor (= 0.66.4) + - React-perflogger (= 0.66.4) - Yoga - - React-Core/RCTBlobHeaders (0.65.1): + - React-Core/RCTBlobHeaders (0.66.4): - glog - - RCT-Folly (= 2021.04.26.00) + - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.65.1) - - React-jsi (= 0.65.1) - - React-jsiexecutor (= 0.65.1) - - React-perflogger (= 0.65.1) + - React-cxxreact (= 0.66.4) + - React-jsi (= 0.66.4) + - React-jsiexecutor (= 0.66.4) + - React-perflogger (= 0.66.4) - Yoga - - React-Core/RCTImageHeaders (0.65.1): + - React-Core/RCTImageHeaders (0.66.4): - glog - - RCT-Folly (= 2021.04.26.00) + - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.65.1) - - React-jsi (= 0.65.1) - - React-jsiexecutor (= 0.65.1) - - React-perflogger (= 0.65.1) + - React-cxxreact (= 0.66.4) + - React-jsi (= 0.66.4) + - React-jsiexecutor (= 0.66.4) + - React-perflogger (= 0.66.4) - Yoga - - React-Core/RCTLinkingHeaders (0.65.1): + - React-Core/RCTLinkingHeaders (0.66.4): - glog - - RCT-Folly (= 2021.04.26.00) + - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.65.1) - - React-jsi (= 0.65.1) - - React-jsiexecutor (= 0.65.1) - - React-perflogger (= 0.65.1) + - React-cxxreact (= 0.66.4) + - React-jsi (= 0.66.4) + - React-jsiexecutor (= 0.66.4) + - React-perflogger (= 0.66.4) - Yoga - - React-Core/RCTNetworkHeaders (0.65.1): + - React-Core/RCTNetworkHeaders (0.66.4): - glog - - RCT-Folly (= 2021.04.26.00) + - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.65.1) - - React-jsi (= 0.65.1) - - React-jsiexecutor (= 0.65.1) - - React-perflogger (= 0.65.1) + - React-cxxreact (= 0.66.4) + - React-jsi (= 0.66.4) + - React-jsiexecutor (= 0.66.4) + - React-perflogger (= 0.66.4) - Yoga - - React-Core/RCTSettingsHeaders (0.65.1): + - React-Core/RCTSettingsHeaders (0.66.4): - glog - - RCT-Folly (= 2021.04.26.00) + - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.65.1) - - React-jsi (= 0.65.1) - - React-jsiexecutor (= 0.65.1) - - React-perflogger (= 0.65.1) + - React-cxxreact (= 0.66.4) + - React-jsi (= 0.66.4) + - React-jsiexecutor (= 0.66.4) + - React-perflogger (= 0.66.4) - Yoga - - React-Core/RCTTextHeaders (0.65.1): + - React-Core/RCTTextHeaders (0.66.4): - glog - - RCT-Folly (= 2021.04.26.00) + - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.65.1) - - React-jsi (= 0.65.1) - - React-jsiexecutor (= 0.65.1) - - React-perflogger (= 0.65.1) + - React-cxxreact (= 0.66.4) + - React-jsi (= 0.66.4) + - React-jsiexecutor (= 0.66.4) + - React-perflogger (= 0.66.4) - Yoga - - React-Core/RCTVibrationHeaders (0.65.1): + - React-Core/RCTVibrationHeaders (0.66.4): - glog - - RCT-Folly (= 2021.04.26.00) + - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.65.1) - - React-jsi (= 0.65.1) - - React-jsiexecutor (= 0.65.1) - - React-perflogger (= 0.65.1) + - React-cxxreact (= 0.66.4) + - React-jsi (= 0.66.4) + - React-jsiexecutor (= 0.66.4) + - React-perflogger (= 0.66.4) - Yoga - - React-Core/RCTWebSocket (0.65.1): + - React-Core/RCTWebSocket (0.66.4): - glog - - RCT-Folly (= 2021.04.26.00) - - React-Core/Default (= 0.65.1) - - React-cxxreact (= 0.65.1) - - React-jsi (= 0.65.1) - - React-jsiexecutor (= 0.65.1) - - React-perflogger (= 0.65.1) + - RCT-Folly (= 2021.06.28.00-v2) + - React-Core/Default (= 0.66.4) + - React-cxxreact (= 0.66.4) + - React-jsi (= 0.66.4) + - React-jsiexecutor (= 0.66.4) + - React-perflogger (= 0.66.4) - Yoga - - React-CoreModules (0.65.1): - - FBReactNativeSpec (= 0.65.1) - - RCT-Folly (= 2021.04.26.00) - - RCTTypeSafety (= 0.65.1) - - React-Core/CoreModulesHeaders (= 0.65.1) - - React-jsi (= 0.65.1) - - React-RCTImage (= 0.65.1) - - ReactCommon/turbomodule/core (= 0.65.1) - - React-cxxreact (0.65.1): - - boost-for-react-native (= 1.63.0) + - React-CoreModules (0.66.4): + - FBReactNativeSpec (= 0.66.4) + - RCT-Folly (= 2021.06.28.00-v2) + - RCTTypeSafety (= 0.66.4) + - React-Core/CoreModulesHeaders (= 0.66.4) + - React-jsi (= 0.66.4) + - React-RCTImage (= 0.66.4) + - ReactCommon/turbomodule/core (= 0.66.4) + - React-cxxreact (0.66.4): + - boost (= 1.76.0) - DoubleConversion - glog - - RCT-Folly (= 2021.04.26.00) - - React-callinvoker (= 0.65.1) - - React-jsi (= 0.65.1) - - React-jsinspector (= 0.65.1) - - React-perflogger (= 0.65.1) - - React-runtimeexecutor (= 0.65.1) - - React-jsi (0.65.1): - - boost-for-react-native (= 1.63.0) + - RCT-Folly (= 2021.06.28.00-v2) + - React-callinvoker (= 0.66.4) + - React-jsi (= 0.66.4) + - React-jsinspector (= 0.66.4) + - React-logger (= 0.66.4) + - React-perflogger (= 0.66.4) + - React-runtimeexecutor (= 0.66.4) + - React-jsi (0.66.4): + - boost (= 1.76.0) - DoubleConversion - glog - - RCT-Folly (= 2021.04.26.00) - - React-jsi/Default (= 0.65.1) - - React-jsi/Default (0.65.1): - - boost-for-react-native (= 1.63.0) + - RCT-Folly (= 2021.06.28.00-v2) + - React-jsi/Default (= 0.66.4) + - React-jsi/Default (0.66.4): + - boost (= 1.76.0) - DoubleConversion - glog - - RCT-Folly (= 2021.04.26.00) - - React-jsiexecutor (0.65.1): + - RCT-Folly (= 2021.06.28.00-v2) + - React-jsiexecutor (0.66.4): - DoubleConversion - glog - - RCT-Folly (= 2021.04.26.00) - - React-cxxreact (= 0.65.1) - - React-jsi (= 0.65.1) - - React-perflogger (= 0.65.1) - - React-jsinspector (0.65.1) - - react-native-video (5.1.1): + - RCT-Folly (= 2021.06.28.00-v2) + - React-cxxreact (= 0.66.4) + - React-jsi (= 0.66.4) + - React-perflogger (= 0.66.4) + - React-jsinspector (0.66.4) + - React-logger (0.66.4): + - glog + - react-native-video (5.2.0): - React-Core - - react-native-video/Video (= 5.1.1) - - react-native-video/Video (5.1.1): + - react-native-video/Video (= 5.2.0) + - react-native-video/Video (5.2.0): - React-Core - - React-perflogger (0.65.1) - - React-RCTActionSheet (0.65.1): - - React-Core/RCTActionSheetHeaders (= 0.65.1) - - React-RCTAnimation (0.65.1): - - FBReactNativeSpec (= 0.65.1) - - RCT-Folly (= 2021.04.26.00) - - RCTTypeSafety (= 0.65.1) - - React-Core/RCTAnimationHeaders (= 0.65.1) - - React-jsi (= 0.65.1) - - ReactCommon/turbomodule/core (= 0.65.1) - - React-RCTBlob (0.65.1): - - FBReactNativeSpec (= 0.65.1) - - RCT-Folly (= 2021.04.26.00) - - React-Core/RCTBlobHeaders (= 0.65.1) - - React-Core/RCTWebSocket (= 0.65.1) - - React-jsi (= 0.65.1) - - React-RCTNetwork (= 0.65.1) - - ReactCommon/turbomodule/core (= 0.65.1) - - React-RCTImage (0.65.1): - - FBReactNativeSpec (= 0.65.1) - - RCT-Folly (= 2021.04.26.00) - - RCTTypeSafety (= 0.65.1) - - React-Core/RCTImageHeaders (= 0.65.1) - - React-jsi (= 0.65.1) - - React-RCTNetwork (= 0.65.1) - - ReactCommon/turbomodule/core (= 0.65.1) - - React-RCTLinking (0.65.1): - - FBReactNativeSpec (= 0.65.1) - - React-Core/RCTLinkingHeaders (= 0.65.1) - - React-jsi (= 0.65.1) - - ReactCommon/turbomodule/core (= 0.65.1) - - React-RCTNetwork (0.65.1): - - FBReactNativeSpec (= 0.65.1) - - RCT-Folly (= 2021.04.26.00) - - RCTTypeSafety (= 0.65.1) - - React-Core/RCTNetworkHeaders (= 0.65.1) - - React-jsi (= 0.65.1) - - ReactCommon/turbomodule/core (= 0.65.1) - - React-RCTSettings (0.65.1): - - FBReactNativeSpec (= 0.65.1) - - RCT-Folly (= 2021.04.26.00) - - RCTTypeSafety (= 0.65.1) - - React-Core/RCTSettingsHeaders (= 0.65.1) - - React-jsi (= 0.65.1) - - ReactCommon/turbomodule/core (= 0.65.1) - - React-RCTText (0.65.1): - - React-Core/RCTTextHeaders (= 0.65.1) - - React-RCTVibration (0.65.1): - - FBReactNativeSpec (= 0.65.1) - - RCT-Folly (= 2021.04.26.00) - - React-Core/RCTVibrationHeaders (= 0.65.1) - - React-jsi (= 0.65.1) - - ReactCommon/turbomodule/core (= 0.65.1) - - React-runtimeexecutor (0.65.1): - - React-jsi (= 0.65.1) - - ReactCommon/turbomodule/core (0.65.1): + - React-perflogger (0.66.4) + - React-RCTActionSheet (0.66.4): + - React-Core/RCTActionSheetHeaders (= 0.66.4) + - React-RCTAnimation (0.66.4): + - FBReactNativeSpec (= 0.66.4) + - RCT-Folly (= 2021.06.28.00-v2) + - RCTTypeSafety (= 0.66.4) + - React-Core/RCTAnimationHeaders (= 0.66.4) + - React-jsi (= 0.66.4) + - ReactCommon/turbomodule/core (= 0.66.4) + - React-RCTBlob (0.66.4): + - FBReactNativeSpec (= 0.66.4) + - RCT-Folly (= 2021.06.28.00-v2) + - React-Core/RCTBlobHeaders (= 0.66.4) + - React-Core/RCTWebSocket (= 0.66.4) + - React-jsi (= 0.66.4) + - React-RCTNetwork (= 0.66.4) + - ReactCommon/turbomodule/core (= 0.66.4) + - React-RCTImage (0.66.4): + - FBReactNativeSpec (= 0.66.4) + - RCT-Folly (= 2021.06.28.00-v2) + - RCTTypeSafety (= 0.66.4) + - React-Core/RCTImageHeaders (= 0.66.4) + - React-jsi (= 0.66.4) + - React-RCTNetwork (= 0.66.4) + - ReactCommon/turbomodule/core (= 0.66.4) + - React-RCTLinking (0.66.4): + - FBReactNativeSpec (= 0.66.4) + - React-Core/RCTLinkingHeaders (= 0.66.4) + - React-jsi (= 0.66.4) + - ReactCommon/turbomodule/core (= 0.66.4) + - React-RCTNetwork (0.66.4): + - FBReactNativeSpec (= 0.66.4) + - RCT-Folly (= 2021.06.28.00-v2) + - RCTTypeSafety (= 0.66.4) + - React-Core/RCTNetworkHeaders (= 0.66.4) + - React-jsi (= 0.66.4) + - ReactCommon/turbomodule/core (= 0.66.4) + - React-RCTSettings (0.66.4): + - FBReactNativeSpec (= 0.66.4) + - RCT-Folly (= 2021.06.28.00-v2) + - RCTTypeSafety (= 0.66.4) + - React-Core/RCTSettingsHeaders (= 0.66.4) + - React-jsi (= 0.66.4) + - ReactCommon/turbomodule/core (= 0.66.4) + - React-RCTText (0.66.4): + - React-Core/RCTTextHeaders (= 0.66.4) + - React-RCTVibration (0.66.4): + - FBReactNativeSpec (= 0.66.4) + - RCT-Folly (= 2021.06.28.00-v2) + - React-Core/RCTVibrationHeaders (= 0.66.4) + - React-jsi (= 0.66.4) + - ReactCommon/turbomodule/core (= 0.66.4) + - React-runtimeexecutor (0.66.4): + - React-jsi (= 0.66.4) + - ReactCommon/turbomodule/core (0.66.4): - DoubleConversion - glog - - RCT-Folly (= 2021.04.26.00) - - React-callinvoker (= 0.65.1) - - React-Core (= 0.65.1) - - React-cxxreact (= 0.65.1) - - React-jsi (= 0.65.1) - - React-perflogger (= 0.65.1) - - RNCPicker (2.1.0): + - RCT-Folly (= 2021.06.28.00-v2) + - React-callinvoker (= 0.66.4) + - React-Core (= 0.66.4) + - React-cxxreact (= 0.66.4) + - React-jsi (= 0.66.4) + - React-logger (= 0.66.4) + - React-perflogger (= 0.66.4) + - RNCPicker (2.2.1): - React-Core - RNFS (2.18.0): - React @@ -357,11 +361,12 @@ PODS: - Yoga (~> 1.14) DEPENDENCIES: + - boost (from `../node_modules/react-native/third-party-podspecs/boost.podspec`) - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`) - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`) - FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`) - ffmpeg-kit-react-native/video (from `../node_modules/ffmpeg-kit-react-native/ffmpeg-kit-react-native.podspec`) - - Flipper (= 0.93.0) + - Flipper (= 0.99.0) - Flipper-Boost-iOSX (= 1.76.0.1.11) - Flipper-DoubleConversion (= 3.1.7) - Flipper-Fmt (= 7.1.7) @@ -369,19 +374,19 @@ DEPENDENCIES: - Flipper-Glog (= 0.3.6) - Flipper-PeerTalk (= 0.0.4) - Flipper-RSocket (= 1.4.3) - - FlipperKit (= 0.93.0) - - FlipperKit/Core (= 0.93.0) - - FlipperKit/CppBridge (= 0.93.0) - - FlipperKit/FBCxxFollyDynamicConvert (= 0.93.0) - - FlipperKit/FBDefines (= 0.93.0) - - FlipperKit/FKPortForwarding (= 0.93.0) - - FlipperKit/FlipperKitHighlightOverlay (= 0.93.0) - - FlipperKit/FlipperKitLayoutPlugin (= 0.93.0) - - FlipperKit/FlipperKitLayoutTextSearchable (= 0.93.0) - - FlipperKit/FlipperKitNetworkPlugin (= 0.93.0) - - FlipperKit/FlipperKitReactPlugin (= 0.93.0) - - FlipperKit/FlipperKitUserDefaultsPlugin (= 0.93.0) - - FlipperKit/SKIOSNetworkPlugin (= 0.93.0) + - FlipperKit (= 0.99.0) + - FlipperKit/Core (= 0.99.0) + - FlipperKit/CppBridge (= 0.99.0) + - FlipperKit/FBCxxFollyDynamicConvert (= 0.99.0) + - FlipperKit/FBDefines (= 0.99.0) + - FlipperKit/FKPortForwarding (= 0.99.0) + - FlipperKit/FlipperKitHighlightOverlay (= 0.99.0) + - FlipperKit/FlipperKitLayoutPlugin (= 0.99.0) + - FlipperKit/FlipperKitLayoutTextSearchable (= 0.99.0) + - FlipperKit/FlipperKitNetworkPlugin (= 0.99.0) + - FlipperKit/FlipperKitReactPlugin (= 0.99.0) + - FlipperKit/FlipperKitUserDefaultsPlugin (= 0.99.0) + - FlipperKit/SKIOSNetworkPlugin (= 0.99.0) - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`) - RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`) - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`) @@ -396,6 +401,7 @@ DEPENDENCIES: - React-jsi (from `../node_modules/react-native/ReactCommon/jsi`) - React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`) - React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`) + - React-logger (from `../node_modules/react-native/ReactCommon/logger`) - react-native-video (from `../node_modules/react-native-video`) - React-perflogger (from `../node_modules/react-native/ReactCommon/reactperflogger`) - React-RCTActionSheet (from `../node_modules/react-native/Libraries/ActionSheetIOS`) @@ -418,7 +424,6 @@ DEPENDENCIES: SPEC REPOS: trunk: - - boost-for-react-native - CocoaAsyncSocket - ffmpeg-kit-ios-video - Flipper @@ -436,6 +441,8 @@ SPEC REPOS: - YogaKit EXTERNAL SOURCES: + boost: + :podspec: "../node_modules/react-native/third-party-podspecs/boost.podspec" DoubleConversion: :podspec: "../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec" FBLazyVector: @@ -468,6 +475,8 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/ReactCommon/jsiexecutor" React-jsinspector: :path: "../node_modules/react-native/ReactCommon/jsinspector" + React-logger: + :path: "../node_modules/react-native/ReactCommon/logger" react-native-video: :path: "../node_modules/react-native-video" React-perflogger: @@ -508,14 +517,14 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/ReactCommon/yoga" SPEC CHECKSUMS: - boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c + boost: a7c83b31436843459a1961bfd74b96033dc77234 CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662 - FBLazyVector: 33c82491102f20ecddb6c6a2c273696ace3191e0 - FBReactNativeSpec: df8f81d2a7541ee6755a047b398a5cb5a72acd0e - ffmpeg-kit-ios-video: 2ba0edaebbc1ac0d7966cdba90901764d8621ed6 - ffmpeg-kit-react-native: 9aaad3964e165aa62d155c821a6357bcdecf4ffd - Flipper: b1fddf9a17c32097b2b4c806ad158b2f36bb2692 + FBLazyVector: e5569e42a1c79ca00521846c223173a57aca1fe1 + FBReactNativeSpec: fe08c1cd7e2e205718d77ad14b34957cce949b58 + ffmpeg-kit-ios-video: df117a872eafb186e287e3c254ad52c52e90c586 + ffmpeg-kit-react-native: f07dd13b146f9bdef9e2639ab68c9e3ddeedc099 + Flipper: 30e8eeeed6abdc98edaf32af0cda2f198be4b733 Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c Flipper-DoubleConversion: 57ffbe81ef95306cc9e69c4aa3aeeeeb58a6a28c Flipper-Fmt: 60cbdd92fc254826e61d669a5d87ef7015396a9b @@ -523,43 +532,44 @@ SPEC CHECKSUMS: Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6 Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541 - FlipperKit: aec2d931adeee48a07bab1ea8bcc8a6bb87dfce4 + FlipperKit: d8d346844eca5d9120c17d441a2f38596e8ed2b9 fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 glog: 5337263514dd6f09803962437687240c5dc39aa4 libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b - RCT-Folly: 0dd9e1eb86348ecab5ba76f910b56f4b5fef3c46 - RCTRequired: 6cf071ab2adfd769014b3d94373744ee6e789530 - RCTTypeSafety: b829c59453478bb5b02487b8de3336386ab93ab1 - React: 29d8a785041b96a2754c25cc16ddea57b7a618ce - React-callinvoker: 2857b61132bd7878b736e282581f4b42fd93002b - React-Core: 001e21bad5ca41e59e9d90df5c0b53da04c3ce8e - React-CoreModules: 0a0410ab296a62ab38e2f8d321e822d1fcc2fe49 - React-cxxreact: 8d904967134ae8ff0119c5357c42eaae976806f8 - React-jsi: 12913c841713a15f64eabf5c9ad98592c0ec5940 - React-jsiexecutor: 43f2542aed3c26e42175b339f8d37fe3dd683765 - React-jsinspector: 41e58e5b8e3e0bf061fdf725b03f2144014a8fb0 - react-native-video: 0bb76b6d6b77da3009611586c7dbf817b947f30e - React-perflogger: fd28ee1f2b5b150b00043f0301d96bd417fdc339 - React-RCTActionSheet: 7f3fa0855c346aa5d7c60f9ced16e067db6d29fa - React-RCTAnimation: 2119a18ee26159004b001bc56404ca5dbaae6077 - React-RCTBlob: a493cc306deeaba0c0efa8ecec2da154afd3a798 - React-RCTImage: 54999ddc896b7db6650af5760607aaebdf30425c - React-RCTLinking: 7fb3fa6397d3700c69c3d361870a299f04f1a2e6 - React-RCTNetwork: 329ee4f75bd2deb8cf6c4b14231b5bb272cbd9af - React-RCTSettings: 1a659d58e45719bc77c280dbebce6a5a5a2733f5 - React-RCTText: e12d7aae2a038be9ae72815436677a7c6549dd26 - React-RCTVibration: 92d41c2442e5328cc4d342cd7f78e5876b68bae5 - React-runtimeexecutor: 85187f19dd9c47a7c102f9994f9d14e4dc2110de - ReactCommon: eafed38eec7b591c31751bfa7494801618460459 - RNCPicker: f7a40b21b915b7a187624d52f52b7bc2f73ea413 + RCT-Folly: a21c126816d8025b547704b777a2ba552f3d9fa9 + RCTRequired: 4bf86c70714490bca4bf2696148638284622644b + RCTTypeSafety: c475a7059eb77935fa53d2c17db299893f057d5d + React: f64af14e3f2c50f6f2c91a5fd250e4ff1b3c3459 + React-callinvoker: b74e4ae80287780dcdf0cab262bcb581eeef56e7 + React-Core: 3eb7432bad96ff1d25aebc1defbae013fee2fd0e + React-CoreModules: ad9e1fd5650e16666c57a08328df86fd7e480cb9 + React-cxxreact: 02633ff398cf7e91a2c1e12590d323c4a4b8668a + React-jsi: 805c41a927d6499fb811772acb971467d9204633 + React-jsiexecutor: 94ce921e1d8ce7023366873ec371f3441383b396 + React-jsinspector: d0374f7509d407d2264168b6d0fad0b54e300b85 + React-logger: 933f80c97c633ee8965d609876848148e3fef438 + react-native-video: a4c2635d0802f983594b7057e1bce8f442f0ad28 + React-perflogger: 93075d8931c32cd1fce8a98c15d2d5ccc4d891bd + React-RCTActionSheet: 7d3041e6761b4f3044a37079ddcb156575fb6d89 + React-RCTAnimation: 743e88b55ac62511ae5c2e22803d4f503f2a3a13 + React-RCTBlob: bee3a2f98fa7fc25c957c8643494244f74bea0a0 + React-RCTImage: 19fc9e29b06cc38611c553494f8d3040bf78c24e + React-RCTLinking: dc799503979c8c711126d66328e7ce8f25c2848f + React-RCTNetwork: 417e4e34cf3c19eaa5fd4e9eb20180d662a799ce + React-RCTSettings: 4df89417265af26501a7e0e9192a34d3d9848dff + React-RCTText: f8a21c3499ab322326290fa9b701ae29aa093aa5 + React-RCTVibration: e3ffca672dd3772536cb844274094b0e2c31b187 + React-runtimeexecutor: dec32ee6f2e2a26e13e58152271535fadff5455a + ReactCommon: 57b69f6383eafcbd7da625bfa6003810332313c4 + RNCPicker: cb57c823d5ce8d2d0b5dfb45ad97b737260dc59e RNFS: 3ab21fa6c56d65566d1fb26c2228e2b6132e5e32 RNGestureHandler: a479ebd5ed4221a810967000735517df0d2db211 RNReanimated: 514a11da3a2bcc6c3dfd9de32b38e2b9bf101926 RNScreens: f7ad633b2e0190b77b6a7aab7f914fad6f198d8d - Yoga: aa0cb45287ebe1004c02a13f279c55a95f1572f4 + Yoga: e7dc4e71caba6472ff48ad7d234389b91dadc280 YogaKit: f782866e155069a2cca2517aafea43200b01fd5a -PODFILE CHECKSUM: 87d069441680ca8b06f0a5a5522efed78449c3a5 +PODFILE CHECKSUM: ddaf7c4815eeccbf013f1d038aee91343db415bb COCOAPODS: 1.11.2 diff --git a/react-native/test-app-local-dependency/package.json b/react-native/test-app-local-dependency/package.json index 6cbebcf..79c43be 100644 --- a/react-native/test-app-local-dependency/package.json +++ b/react-native/test-app-local-dependency/package.json @@ -1,6 +1,6 @@ { "name": "ffmpeg-kit-react-native-test", - "version": "4.5.0", + "version": "4.5.1", "private": true, "scripts": { "android": "react-native run-android", @@ -17,7 +17,7 @@ "node-fetch": "^2.6.1", "prop-types": "^15.7.2", "react": "^17.0.2", - "react-native": "^0.65.1", + "react-native": "^0.66.4", "react-native-fs": "^2.16.6", "react-native-gesture-handler": "^1.9.0", "react-native-reanimated": "^1.13.2", diff --git a/react-native/test-app-local-dependency/src/audio-tab.js b/react-native/test-app-local-dependency/src/audio-tab.js index 3561872..4542fae 100644 --- a/react-native/test-app-local-dependency/src/audio-tab.js +++ b/react-native/test-app-local-dependency/src/audio-tab.js @@ -67,7 +67,7 @@ export default class AudioTab extends React.Component { ffprint(`FFmpeg process started with arguments:\n\'${ffmpegCommand}\'.`); - FFmpegKit.executeAsync(ffmpegCommand, async (session) => { + FFmpegKit.execute(ffmpegCommand).then(async (session) => { const state = FFmpegKitConfig.sessionStateToString(await session.getState()); const returnCode = await session.getReturnCode(); const failStackTrace = await session.getFailStackTrace(); @@ -96,7 +96,7 @@ export default class AudioTab extends React.Component { ffprint(`Creating audio sample with '${ffmpegCommand}'.`); - FFmpegKit.executeAsync(ffmpegCommand, async (session) => { + FFmpegKit.execute(ffmpegCommand).then(async (session) => { const state = FFmpegKitConfig.sessionStateToString(await session.getState()); const returnCode = await session.getReturnCode(); const failStackTrace = await session.getFailStackTrace(); diff --git a/react-native/test-app-local-dependency/src/command-tab.js b/react-native/test-app-local-dependency/src/command-tab.js index dcc1abb..2acafde 100644 --- a/react-native/test-app-local-dependency/src/command-tab.js +++ b/react-native/test-app-local-dependency/src/command-tab.js @@ -18,8 +18,7 @@ export default class CommandTab extends React.Component { super(props); this.state = { - commandText: '', - outputText: '' + commandText: '', outputText: '' }; this.popupReference = React.createRef(); @@ -58,18 +57,19 @@ export default class CommandTab extends React.Component { ffprint(`FFmpeg process started with arguments:\n\'${ffmpegCommand}\'.`); - FFmpegKit.executeAsync(ffmpegCommand, async (session) => { + FFmpegKit.execute(ffmpegCommand).then(async (session) => { const state = FFmpegKitConfig.sessionStateToString(await session.getState()); const returnCode = await session.getReturnCode(); const failStackTrace = await session.getFailStackTrace(); + const output = await session.getOutput(); ffprint(`FFmpeg process exited with state ${state} and rc ${returnCode}.${notNull(failStackTrace, "\\n")}`); + this.appendOutput(output); + if (state === SessionState.FAILED || !returnCode.isValueSuccess()) { showPopup(this.popupReference, "Command failed. Please check output for the details."); } - }, log => { - this.appendOutput(log.getMessage()); }); }; @@ -102,51 +102,49 @@ export default class CommandTab extends React.Component { }; render() { - return ( - - - - FFmpegKit ReactNative - - - - this.setState({commandText})} - value={this.state.commandText} - /> - - - - RUN FFMPEG - - - - - - RUN FFPROBE - - - - { - this.scrollViewReference = view; - }} - onContentSizeChange={(width, height) => this.scrollViewReference.scrollTo({y: height})} - style={styles.outputScrollViewStyle}> - {this.state.outputText} - - + return ( + + + FFmpegKit ReactNative + + + + this.setState({commandText})} + value={this.state.commandText} + /> + + + + RUN FFMPEG + + + + + + RUN FFPROBE + + + + { + this.scrollViewReference = view; + }} + onContentSizeChange={(width, height) => this.scrollViewReference.scrollTo({y: height})} + style={styles.outputScrollViewStyle}> + {this.state.outputText} + - ); + ); }; } diff --git a/react-native/test-app-local-dependency/src/https-tab.js b/react-native/test-app-local-dependency/src/https-tab.js index 851ad04..2f14a91 100644 --- a/react-native/test-app-local-dependency/src/https-tab.js +++ b/react-native/test-app-local-dependency/src/https-tab.js @@ -96,112 +96,141 @@ export default class HttpsTab extends React.Component { } // EXECUTE - FFprobeKit.getMediaInformationAsync(testUrl, this.createNewExecuteCallback); - }; - - createNewExecuteCallback = async (session) => { - const information = await session.getMediaInformation(); + FFprobeKit.getMediaInformation(testUrl).then(async (session) => { + const information = await session.getMediaInformation(); - if (information === undefined) { - const state = FFmpegKitConfig.sessionStateToString(await session.getState()); - const returnCode = await session.getReturnCode(); - const failStackTrace = await session.getFailStackTrace(); - const duration = await session.getDuration(); - const output = await session.getOutput(); + if (information === undefined) { + const state = FFmpegKitConfig.sessionStateToString(await session.getState()); + const returnCode = await session.getReturnCode(); + const failStackTrace = await session.getFailStackTrace(); + const duration = await session.getDuration(); + const output = await session.getOutput(); - this.appendOutput(`Get media information failed\n`); - this.appendOutput(`State: ${state}\n`); - this.appendOutput(`Duration: ${duration}\n`); - this.appendOutput(`Return Code: ${returnCode}\n`); - this.appendOutput(`Fail stack trace: ${notNull(failStackTrace, "\\n")}\n`); - this.appendOutput(`Output: ${output}\n`); - } else { - this.appendOutput(`Media information for ${information.getFilename()}\n`); + this.appendOutput(`Get media information failed\n`); + this.appendOutput(`State: ${state}\n`); + this.appendOutput(`Duration: ${duration}\n`); + this.appendOutput(`Return Code: ${returnCode}\n`); + this.appendOutput(`Fail stack trace: ${notNull(failStackTrace, "\\n")}\n`); + this.appendOutput(`Output: ${output}\n`); + } else { + this.appendOutput(`Media information for ${information.getFilename()}\n`); - if (information.getFormat() !== undefined) { - this.appendOutput(`Format: ${information.getFormat()}\n`); - } - if (information.getBitrate() !== undefined) { - this.appendOutput(`Bitrate: ${information.getBitrate()}\n`); - } - if (information.getDuration() !== undefined) { - this.appendOutput(`Duration: ${information.getDuration()}\n`); - } - if (information.getStartTime() !== undefined) { - this.appendOutput(`Start time: ${information.getStartTime()}\n`); - } - if (information.getTags() !== undefined) { - let tags = information.getTags(); - Object.keys(tags).forEach((key) => { - this.appendOutput(`Tag: ${key}:${tags[key]}\n`); - }); - } + if (information.getFormat() !== undefined) { + this.appendOutput(`Format: ${information.getFormat()}\n`); + } + if (information.getBitrate() !== undefined) { + this.appendOutput(`Bitrate: ${information.getBitrate()}\n`); + } + if (information.getDuration() !== undefined) { + this.appendOutput(`Duration: ${information.getDuration()}\n`); + } + if (information.getStartTime() !== undefined) { + this.appendOutput(`Start time: ${information.getStartTime()}\n`); + } + if (information.getTags() !== undefined) { + let tags = information.getTags(); + Object.keys(tags).forEach((key) => { + this.appendOutput(`Tag: ${key}:${tags[key]}\n`); + }); + } - let streams = information.getStreams(); - if (streams !== undefined) { - for (let i = 0; i < streams.length; ++i) { - let stream = streams[i]; - if (stream.getIndex() != null) { - this.appendOutput(`Stream index: ${stream.getIndex()}\n`); - } - if (stream.getType() != null) { - this.appendOutput(`Stream type: ${stream.getType()}\n`); - } - if (stream.getCodec() != null) { - this.appendOutput(`Stream codec: ${stream.getCodec()}\n`); - } - if (stream.getCodecLong() != null) { - this.appendOutput(`Stream codec long: ${stream.getCodecLong()}\n`); - } - if (stream.getFormat() != null) { - this.appendOutput(`Stream format: ${stream.getFormat()}\n`); - } - if (stream.getWidth() != null) { - this.appendOutput(`Stream width: ${stream.getWidth()}\n`); + let streams = information.getStreams(); + if (streams !== undefined) { + for (let i = 0; i < streams.length; ++i) { + let stream = streams[i]; + if (stream.getIndex() != null) { + this.appendOutput(`Stream index: ${stream.getIndex()}\n`); + } + if (stream.getType() != null) { + this.appendOutput(`Stream type: ${stream.getType()}\n`); + } + if (stream.getCodec() != null) { + this.appendOutput(`Stream codec: ${stream.getCodec()}\n`); + } + if (stream.getCodecLong() != null) { + this.appendOutput(`Stream codec long: ${stream.getCodecLong()}\n`); + } + if (stream.getFormat() != null) { + this.appendOutput(`Stream format: ${stream.getFormat()}\n`); + } + if (stream.getWidth() != null) { + this.appendOutput(`Stream width: ${stream.getWidth()}\n`); + } + if (stream.getHeight() != null) { + this.appendOutput(`Stream height: ${stream.getHeight()}\n`); + } + if (stream.getBitrate() != null) { + this.appendOutput(`Stream bitrate: ${stream.getBitrate()}\n`); + } + if (stream.getSampleRate() != null) { + this.appendOutput(`Stream sample rate: ${stream.getSampleRate()}\n`); + } + if (stream.getSampleFormat() != null) { + this.appendOutput(`Stream sample format: ${stream.getSampleFormat()}\n`); + } + if (stream.getChannelLayout() != null) { + this.appendOutput(`Stream channel layout: ${stream.getChannelLayout()}\n`); + } + if (stream.getSampleAspectRatio() != null) { + this.appendOutput(`Stream sample aspect ratio: ${stream.getSampleAspectRatio()}\n`); + } + if (stream.getDisplayAspectRatio() != null) { + this.appendOutput(`Stream display ascpect ratio: ${stream.getDisplayAspectRatio()}\n`); + } + if (stream.getAverageFrameRate() != null) { + this.appendOutput(`Stream average frame rate: ${stream.getAverageFrameRate()}\n`); + } + if (stream.getRealFrameRate() != null) { + this.appendOutput(`Stream real frame rate: ${stream.getRealFrameRate()}\n`); + } + if (stream.getTimeBase() != null) { + this.appendOutput(`Stream time base: ${stream.getTimeBase()}\n`); + } + if (stream.getCodecTimeBase() != null) { + this.appendOutput(`Stream codec time base: ${stream.getCodecTimeBase()}\n`); + } + if (stream.getTags() !== undefined) { + let tags = stream.getTags(); + Object.keys(tags).forEach((key) => { + this.appendOutput(`Stream tag: ${key}:${tags[key]}\n`); + }); + } } - if (stream.getHeight() != null) { - this.appendOutput(`Stream height: ${stream.getHeight()}\n`); - } - if (stream.getBitrate() != null) { - this.appendOutput(`Stream bitrate: ${stream.getBitrate()}\n`); - } - if (stream.getSampleRate() != null) { - this.appendOutput(`Stream sample rate: ${stream.getSampleRate()}\n`); - } - if (stream.getSampleFormat() != null) { - this.appendOutput(`Stream sample format: ${stream.getSampleFormat()}\n`); - } - if (stream.getChannelLayout() != null) { - this.appendOutput(`Stream channel layout: ${stream.getChannelLayout()}\n`); - } - if (stream.getSampleAspectRatio() != null) { - this.appendOutput(`Stream sample aspect ratio: ${stream.getSampleAspectRatio()}\n`); - } - if (stream.getDisplayAspectRatio() != null) { - this.appendOutput(`Stream display ascpect ratio: ${stream.getDisplayAspectRatio()}\n`); - } - if (stream.getAverageFrameRate() != null) { - this.appendOutput(`Stream average frame rate: ${stream.getAverageFrameRate()}\n`); - } - if (stream.getRealFrameRate() != null) { - this.appendOutput(`Stream real frame rate: ${stream.getRealFrameRate()}\n`); - } - if (stream.getTimeBase() != null) { - this.appendOutput(`Stream time base: ${stream.getTimeBase()}\n`); - } - if (stream.getCodecTimeBase() != null) { - this.appendOutput(`Stream codec time base: ${stream.getCodecTimeBase()}\n`); - } - if (stream.getTags() !== undefined) { - let tags = stream.getTags(); - Object.keys(tags).forEach((key) => { - this.appendOutput(`Stream tag: ${key}:${tags[key]}\n`); - }); + } + + let chapters = information.getChapters(); + if (chapters !== undefined) { + for (let i = 0; i < chapters.length; ++i) { + let chapter = chapters[i]; + if (chapter.getId() != null) { + this.appendOutput(`Chapter id: ${chapter.getId()}\n`); + } + if (chapter.getTimeBase() != null) { + this.appendOutput(`Chapter time base: ${chapter.getTimeBase()}\n`); + } + if (chapter.getStart() != null) { + this.appendOutput(`Chapter start: ${chapter.getStart()}\n`); + } + if (chapter.getStartTime() != null) { + this.appendOutput(`Chapter start time: ${chapter.getStartTime()}\n`); + } + if (chapter.getEnd() != null) { + this.appendOutput(`Chapter end: ${chapter.getEnd()}\n`); + } + if (chapter.getEndTime() != null) { + this.appendOutput(`Chapter end time: ${chapter.getEndTime()}\n`); + } + if (chapter.getTags() !== undefined) { + let tags = chapter.getTags(); + Object.keys(tags).forEach((key) => { + this.appendOutput(`Chapter tag: ${key}:${tags[key]}\n`); + }); + } } } } - } - } + }); + }; render() { return ( diff --git a/react-native/test-app-local-dependency/src/other-tab.js b/react-native/test-app-local-dependency/src/other-tab.js index 51b8ad6..ccebe52 100644 --- a/react-native/test-app-local-dependency/src/other-tab.js +++ b/react-native/test-app-local-dependency/src/other-tab.js @@ -64,6 +64,9 @@ export default class OtherTab extends React.Component { case "webp": this.testWebp(); break; + case "zscale": + this.testZscale(); + break; } } @@ -156,6 +159,33 @@ export default class OtherTab extends React.Component { }); } + testZscale() { + let videoFile = `${RNFS.CachesDirectoryPath}/video.mp4`; + let zscaledVideoFile = `${RNFS.CachesDirectoryPath}/video.zscaled.mp4`; + + ffprint("Testing 'zscale' filter with video file created on the Video tab"); + + let ffmpegCommand = VideoUtil.generateZscaleVideoScript(videoFile, zscaledVideoFile); + + ffprint(`FFmpeg process started with arguments \'${ffmpegCommand}\'.`); + + FFmpegKit.executeAsync(ffmpegCommand, async (session) => { + const state = FFmpegKitConfig.sessionStateToString(await session.getState()); + const returnCode = await session.getReturnCode(); + const failStackTrace = await session.getFailStackTrace(); + + ffprint(`FFmpeg process exited with state ${state} and rc ${returnCode}.${notNull(failStackTrace, "\\n")}`); + + if (ReturnCode.isSuccess(returnCode)) { + showPopup(this.popupReference, "zscale completed successfully."); + } else { + showPopup(this.popupReference, "zscale failed. Please check logs for the details."); + } + }, log => { + this.appendOutput(log.getMessage()); + }); + } + getChromaprintSampleFile() { return `${RNFS.CachesDirectoryPath}/audio-sample.wav`; } @@ -186,6 +216,7 @@ export default class OtherTab extends React.Component { + diff --git a/react-native/test-app-local-dependency/src/saf-tab.js b/react-native/test-app-local-dependency/src/saf-tab.js index ef91da7..d7f7ab1 100644 --- a/react-native/test-app-local-dependency/src/saf-tab.js +++ b/react-native/test-app-local-dependency/src/saf-tab.js @@ -64,7 +64,7 @@ export default class SafTab extends React.Component { ffprint(`FFprobe process started with arguments:\n\'${ffprobeCommand}\'.`); - FFprobeKit.executeAsync(ffprobeCommand, async (session) => { + FFprobeKit.execute(ffprobeCommand).then(async (session) => { const state = FFmpegKitConfig.sessionStateToString(await session.getState()); const returnCode = await session.getReturnCode(); const failStackTrace = await session.getFailStackTrace(); @@ -83,7 +83,7 @@ export default class SafTab extends React.Component { encodeVideo = () => { FFmpegKitConfig.selectDocumentForWrite('video.mp4', 'video/*') .then(uri => { - FFmpegKitConfig.getSafParameterForWrite(uri) + FFmpegKitConfig.getSafParameter(uri, "rw") .then(safUrl => { let image1Path = VideoUtil.assetPath(VideoUtil.ASSET_1); let image2Path = VideoUtil.assetPath(VideoUtil.ASSET_2); @@ -146,8 +146,7 @@ export default class SafTab extends React.Component { } render() { - return ( - + return ( FFmpegKit ReactNative @@ -181,8 +180,7 @@ export default class SafTab extends React.Component { {this.state.outputText} - - ); + ); }; } diff --git a/react-native/test-app-local-dependency/src/util.js b/react-native/test-app-local-dependency/src/util.js index 14a6cc4..e6e49e3 100644 --- a/react-native/test-app-local-dependency/src/util.js +++ b/react-native/test-app-local-dependency/src/util.js @@ -20,7 +20,7 @@ export function notNull(string, valuePrefix) { } export function listFFprobeSessions() { - FFprobeKit.listSessions().then(sessionList => { + FFprobeKit.listFFprobeSessions().then(sessionList => { ffprint(`Listing ${sessionList.length} FFprobe sessions asynchronously.`); let count = 0; diff --git a/react-native/test-app-local-dependency/src/video-tab.js b/react-native/test-app-local-dependency/src/video-tab.js index 576e0c4..4805aa2 100644 --- a/react-native/test-app-local-dependency/src/video-tab.js +++ b/react-native/test-app-local-dependency/src/video-tab.js @@ -16,8 +16,7 @@ export default class VideoTab extends React.Component { super(props); this.state = { - selectedCodec: 'mpeg4', - statistics: undefined + selectedCodec: 'mpeg4', statistics: undefined }; this.popupReference = React.createRef(); @@ -56,7 +55,7 @@ export default class VideoTab extends React.Component { this.hideProgressDialog(); this.showProgressDialog(); - let ffmpegCommand = VideoUtil.generateEncodeVideoScript(image1Path, image2Path, image3Path, videoFile, videoCodec, this.getCustomOptions()); + let ffmpegCommand = VideoUtil.generateEncodeVideoScriptWithCustomPixelFormat(image1Path, image2Path, image3Path, videoFile, videoCodec, this.getPixelFormat(), this.getCustomOptions()); ffprint(`FFmpeg process started with arguments:\n\'${ffmpegCommand}\'.`); @@ -95,6 +94,19 @@ export default class VideoTab extends React.Component { this.setState({paused: true}); } + getPixelFormat() { + let videoCodec = this.state.selectedCodec; + + let pixelFormat; + if (videoCodec === "x265") { + pixelFormat = "yuv420p10le"; + } else { + pixelFormat = "yuv420p"; + } + + return pixelFormat; + } + getSelectedVideoCodec() { let videoCodec = this.state.selectedCodec; @@ -212,56 +224,52 @@ export default class VideoTab extends React.Component { } render() { - return ( - - - - FFmpegKit ReactNative - - - - - this.setState({selectedCodec: itemValue}) - }> - - - - - - - - - - - - - - - - CREATE - - - - -