Skip to content

Commit

Permalink
Version 2.44.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Vitaliy Salnikov committed Jan 30, 2025
1 parent c5a918c commit ea89bd3
Show file tree
Hide file tree
Showing 3,976 changed files with 3,999 additions and 3,927 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
10 changes: 5 additions & 5 deletions Demo/PlayerDemo.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -659,7 +659,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2.43;
CURRENT_PROJECT_VERSION = 2.44;
DEVELOPMENT_TEAM = "";
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
Expand All @@ -668,7 +668,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2.43;
MARKETING_VERSION = 2.44;
PRODUCT_BUNDLE_IDENTIFIER = com.onevideo.player.demo;
PRODUCT_NAME = "$(TARGET_NAME)";
STRIP_INSTALLED_PRODUCT = NO;
Expand All @@ -685,7 +685,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2.43;
CURRENT_PROJECT_VERSION = 2.44;
DEVELOPMENT_TEAM = "";
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
Expand All @@ -694,7 +694,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2.43;
MARKETING_VERSION = 2.44;
PRODUCT_BUNDLE_IDENTIFIER = com.onevideo.player.demo;
PRODUCT_NAME = "$(TARGET_NAME)";
STRIP_INSTALLED_PRODUCT = NO;
Expand Down Expand Up @@ -732,7 +732,7 @@
repositoryURL = "https://github.com/VKCOM/VideoPlayer-iOS";
requirement = {
kind = exactVersion;
version = 2.43.0;
version = 2.44.0;
};
};
/* End XCRemoteSwiftPackageReference section */
Expand Down
8 changes: 8 additions & 0 deletions Demo/PlayerDemo/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,14 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
Environment.shared.allowsExternalPlayback = true
Environment.shared.allowsBackgroundPlayback = true
Environment.shared.enableDiagnosticsView = true
Environment._handleLowMemory = 10
Environment._handleLowMemoryHardLevel = true

Environment._cmafAbrBuffer = true
Environment._cmafRecoverAfterStall = 5
Environment._cmafSimpleTimeline = true
Environment._cmafAbrHarmonicCount = 12
Environment._cmafAudioDataPlayedBack = true

#if canImport(OVKitMyTargetPlugin)
Environment.shared.myTargetPlugin = MyTargetPluginImpl()
Expand Down
2 changes: 1 addition & 1 deletion Demo/PlayerDemo/Downloads/DownloadService.swift
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class DownloadService {

func downloadVideo(_ video: VideoType) {
let useHLS = SettingsViewController.useHLS
downloader.downloadVideo(video, inQuality: 1080, useHLS: useHLS, userData: nil)
downloader.downloadVideo(video, inQuality: 1080, useHLS: useHLS, onlySound: false, userData: nil)
}

func deleteVideo(_ video: VideoType) {
Expand Down
4 changes: 0 additions & 4 deletions Demo/PlayerDemo/Settings/Environment.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ extension Environment {
static var demo_advCustomSlotIdKey: String { "\(String(describing: Environment.self)).\(#keyPath(OVKit.Environment._advCustomSlotId))" }
static var demo_advCustomCreativeTypeKey: String { "\(String(describing: Environment.self)).\(#keyPath(OVKit.Environment._advCustomCreativeType))" }
static var demo_advDeviceIdKey: String { "\(String(describing: Environment.self)).\(#keyPath(OVKit.Environment._advDeviceId))" }
static var demo_enableMotionAdKey: String { "\(String(describing: Environment.self)).\(#keyPath(OVKit.Environment._enableMotionAd))" }
#if DEBUG
static var demo_focusDebug: String { "\(String(describing: Environment.self)).\(#keyPath(SettingsViewController.focusDebug))" }
#endif
Expand Down Expand Up @@ -39,9 +38,6 @@ extension Environment {
if let advDeviceId = UserDefaults.standard.string(forKey: Environment.demo_advDeviceIdKey), advDeviceId.count > 0 {
_advDeviceId = advDeviceId
}
if UserDefaults.standard.object(forKey: Environment.demo_enableMotionAdKey) != nil {
Environment._enableMotionAd = UserDefaults.standard.bool(forKey: Environment.demo_enableMotionAdKey)
}
#if DEBUG
if UserDefaults.standard.object(forKey: Environment.demo_focusDebug) != nil {
SettingsViewController.focusDebug = UserDefaults.standard.bool(forKey: Environment.demo_focusDebug)
Expand Down
15 changes: 0 additions & 15 deletions Demo/PlayerDemo/Settings/SettingsViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ struct SettingsView: View {
@AppStorage(Environment.demo_advExpIdKey)
private var advExpId: String = ""

@AppStorage(Environment.demo_enableMotionAdKey)
private var enableVideoMotion: Bool = false
#if DEBUG
@AppStorage(Environment.demo_focusDebug)
private var focusDebug: Bool = false
Expand Down Expand Up @@ -98,14 +96,6 @@ struct SettingsView: View {
Section {
NavigationLink("Advertisement") {
List {
Section {
Toggle(isOn: $enableVideoMotion.animation()) {
Text("Video Motion")
}
.onChange(of: enableVideoMotion, perform: self.updateEnableVideoMotion)
} footer: {
Text("Enable Video Motion format for In-stream video ads.")
}
Section {
Toggle(isOn: $advDebug.animation()) {
Text("Debug Mode")
Expand Down Expand Up @@ -186,11 +176,6 @@ struct SettingsView: View {
Environment.shared._advDebug = advDebug
}

private func updateEnableVideoMotion(value: Bool) {
enableVideoMotion = value
Environment._enableMotionAd = enableVideoMotion
}

private func updateCustomSlotId(value: String) {
if let number = UInt(value) {
advCustomSlotId = value
Expand Down
9 changes: 0 additions & 9 deletions Demo/PlayerDemo/Single/ImportFormatView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -120,15 +120,6 @@ class ImportFormatView: UIButton {
isLive = true
return
}
if string.contains("/dash/stream") {
if string.contains("offset_p") {
rawUrl = (.dashLivePlayback, url)
} else {
rawUrl = (.dashLive, url)
}
isLive = true
return
}
if string.contains("/cmaf/") || string.contains("/live.prod/") || string.contains("/live.test/") {
rawUrl = (.dashCmaf, url)
return
Expand Down
18 changes: 9 additions & 9 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
// swift-tools-version: 5.9
// 2024-12-17 18:08:37
// Version: 2.43.0
// App version: 8.110
// 2025-01-30 15:36:18
// Version: 2.44.0
// App version: 8.114

import PackageDescription

let package = Package(name: "VKVideoPlayer", platforms: [.iOS(.v14)],
products: [
.library(name: "VKVideoPlayer", targets: ["OVKResources", "VPX", "VKOpus", "WebM", "Dav1d", "OVKitStatistics", "OVKit", "OVPlayerKit"]),
.library(name: "VKVideoPlayer", targets: ["VKOpus", "VPX", "OVKResources", "OVKit", "OVKitStatistics", "WebM", "Dav1d", "OVPlayerKit"]),
],
targets: [
.binaryTarget(name: "OVKResources", url: "https://artifactory-external.vkpartner.ru/artifactory/vk-ios-sdk/OVKResources/2.81/OVKResources.xcframework.zip", checksum: "9a7815680defc9266c551766f7e2d87265a8c875cd1770ac21ab8581ed3e0c2c"),
.binaryTarget(name: "VPX", url: "https://artifactory-external.vkpartner.ru/artifactory/vk-ios-sdk/VPX/1.2.1/VPX.xcframework.zip", checksum: "9377ec0ff544202efee0002b2e876d113ec6afb417aa33d2697f00a3c0ce155f"),
.binaryTarget(name: "VKOpus", url: "https://artifactory-external.vkpartner.ru/artifactory/vk-ios-sdk/VKOpus/1.0/VKOpus.xcframework.zip", checksum: "6ac2419048a1479f94d1d9ce434735fad9190dae2b087bad0f1581530013508f"),
.binaryTarget(name: "VPX", url: "https://artifactory-external.vkpartner.ru/artifactory/vk-ios-sdk/VPX/1.2.1/VPX.xcframework.zip", checksum: "9377ec0ff544202efee0002b2e876d113ec6afb417aa33d2697f00a3c0ce155f"),
.binaryTarget(name: "OVKResources", url: "https://artifactory-external.vkpartner.ru/artifactory/vk-ios-sdk/OVKResources/2.82/OVKResources.xcframework.zip", checksum: "69cdb4982e7fb9f5d8a62a374f0bc4b5a48a94b406391e6f9f646fa85551eae8"),
.binaryTarget(name: "OVKit", url: "https://artifactory-external.vkpartner.ru/artifactory/vk-ios-sdk/OVKit/5.44/OVKit.xcframework.zip", checksum: "314662d0631029a01851ba7029259b8a52cd5b1537f3f1d159a9c89e7be4119f"),
.binaryTarget(name: "OVKitStatistics", url: "https://artifactory-external.vkpartner.ru/artifactory/vk-ios-sdk/OVKitStatistics/1.31/OVKitStatistics.xcframework.zip", checksum: "7b36cd1da64932692a83e68dbbb49c2e1d4f98b75dbc345452ddd422a99172cd"),
.binaryTarget(name: "WebM", url: "https://artifactory-external.vkpartner.ru/artifactory/vk-ios-sdk/WebM/1.2.1/WebM.xcframework.zip", checksum: "a5456984ca8ad47efd286c9f0112ab3b9995c21f50923203b19462414f0c6bb4"),
.binaryTarget(name: "Dav1d", url: "https://artifactory-external.vkpartner.ru/artifactory/vk-ios-sdk/Dav1d/2.0/Dav1d.xcframework.zip", checksum: "f9c1945e81936dd4fde648e8716eeb01cbcfe762f462d4efd6dac8782fac5399"),
.binaryTarget(name: "OVKitStatistics", url: "https://artifactory-external.vkpartner.ru/artifactory/vk-ios-sdk/OVKitStatistics/1.30/OVKitStatistics.xcframework.zip", checksum: "af94e473a7cb8277072882ed23b28b5729ef88f60d59e716b1e34b7680f3a40c"),
.binaryTarget(name: "OVKit", url: "https://artifactory-external.vkpartner.ru/artifactory/vk-ios-sdk/OVKit/5.43/OVKit.xcframework.zip", checksum: "62f443b2bd6109bead98283fd2415961be53ac794e6d0b5aaaf0f82a5b0c1801"),
.binaryTarget(name: "OVPlayerKit", url: "https://artifactory-external.vkpartner.ru/artifactory/vk-ios-sdk/OVPlayerKit/3.83/OVPlayerKit.xcframework.zip", checksum: "7d63d60bb4eaab5884f5fe86d073d1abb88a962df1706155a3de7f37d96b7728"),
.binaryTarget(name: "OVPlayerKit", url: "https://artifactory-external.vkpartner.ru/artifactory/vk-ios-sdk/OVPlayerKit/3.84/OVPlayerKit.xcframework.zip", checksum: "25a4982562d1486b8ffa8515c896fdf507c4f615d58001c9b549b1479c29705f"),
]
)
10 changes: 5 additions & 5 deletions Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ artifactory_url = 'https://artifactory-external.vkpartner.ru/artifactory/vk-ios-
target 'PlayerDemo' do
use_frameworks!

pod 'OVKResources', :podspec => "#{artifactory_url}/OVKResources/2.81/OVKResources.podspec", :inhibit_warnings => true
pod 'VPX', :podspec => "#{artifactory_url}/VPX/1.2.1/VPX.podspec", :inhibit_warnings => true
pod 'VKOpus', :podspec => "#{artifactory_url}/VKOpus/1.0/VKOpus.podspec", :inhibit_warnings => true
pod 'VPX', :podspec => "#{artifactory_url}/VPX/1.2.1/VPX.podspec", :inhibit_warnings => true
pod 'OVKResources', :podspec => "#{artifactory_url}/OVKResources/2.82/OVKResources.podspec", :inhibit_warnings => true
pod 'OVKit', :podspec => "#{artifactory_url}/OVKit/5.44/OVKit.podspec", :inhibit_warnings => true
pod 'OVKitStatistics', :podspec => "#{artifactory_url}/OVKitStatistics/1.31/OVKitStatistics.podspec", :inhibit_warnings => true
pod 'WebM', :podspec => "#{artifactory_url}/WebM/1.2.1/WebM.podspec", :inhibit_warnings => true
pod 'Dav1d', :podspec => "#{artifactory_url}/Dav1d/2.0/Dav1d.podspec", :inhibit_warnings => true
pod 'OVKitStatistics', :podspec => "#{artifactory_url}/OVKitStatistics/1.30/OVKitStatistics.podspec", :inhibit_warnings => true
pod 'OVKit', :podspec => "#{artifactory_url}/OVKit/5.43/OVKit.podspec", :inhibit_warnings => true
pod 'OVPlayerKit', :podspec => "#{artifactory_url}/OVPlayerKit/3.83/OVPlayerKit.podspec", :inhibit_warnings => true
pod 'OVPlayerKit', :podspec => "#{artifactory_url}/OVPlayerKit/3.84/OVPlayerKit.podspec", :inhibit_warnings => true
end

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/data/documentation/ovkit.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/data/documentation/ovkit/adinteractive.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"variants":[{"traits":[{"interfaceLanguage":"swift"}],"paths":["\/documentation\/ovkit\/adinteractive"]}],"schemaVersion":{"major":0,"minor":3,"patch":0},"kind":"symbol","metadata":{"roleHeading":"Enumeration","navigatorTitle":[{"text":"AdInteractive","kind":"identifier"}],"externalID":"s:5OVKit13AdInteractiveO","modules":[{"name":"OVKit"}],"title":"AdInteractive","role":"symbol","symbolKind":"enum","fragments":[{"text":"enum","kind":"keyword"},{"text":" ","kind":"text"},{"text":"AdInteractive","kind":"identifier"}]},"hierarchy":{"paths":[["doc:\/\/onevideo.OVKit\/documentation\/OVKit"]]},"sections":[],"primaryContentSections":[{"kind":"declarations","declarations":[{"languages":["swift"],"tokens":[{"text":"enum","kind":"keyword"},{"kind":"text","text":" "},{"kind":"identifier","text":"AdInteractive"}],"platforms":["iOS"]}]}],"identifier":{"interfaceLanguage":"swift","url":"doc:\/\/onevideo.OVKit\/documentation\/OVKit\/AdInteractive"},"topicSections":[{"anchor":"Enumeration-Cases","identifiers":["doc:\/\/onevideo.OVKit\/documentation\/OVKit\/AdInteractive\/shoppable(items:)","doc:\/\/onevideo.OVKit\/documentation\/OVKit\/AdInteractive\/videoMotion(banner:)"],"title":"Enumeration Cases","generated":true}],"references":{"doc://onevideo.OVKit/documentation/OVKit/AdInteractive/shoppable(items:)":{"fragments":[{"kind":"keyword","text":"case"},{"text":" ","kind":"text"},{"text":"shoppable","kind":"identifier"},{"kind":"text","text":"("},{"kind":"externalParam","text":"items"},{"text":": [","kind":"text"},{"text":"ShoppableAdsItem","kind":"typeIdentifier","preciseIdentifier":"s:5OVKit16ShoppableAdsItemV"},{"text":"])","kind":"text"}],"kind":"symbol","role":"symbol","url":"\/documentation\/ovkit\/adinteractive\/shoppable(items:)","identifier":"doc:\/\/onevideo.OVKit\/documentation\/OVKit\/AdInteractive\/shoppable(items:)","type":"topic","title":"AdInteractive.shoppable(items:)","abstract":[]},"doc://onevideo.OVKit/documentation/OVKit":{"title":"OVKit","url":"\/documentation\/ovkit","abstract":[{"type":"text","text":"Плеер видео и трансляций для VK Видео."}],"role":"collection","identifier":"doc:\/\/onevideo.OVKit\/documentation\/OVKit","type":"topic","kind":"symbol"},"doc://onevideo.OVKit/documentation/OVKit/AdInteractive":{"abstract":[],"role":"symbol","title":"AdInteractive","type":"topic","kind":"symbol","url":"\/documentation\/ovkit\/adinteractive","fragments":[{"text":"enum","kind":"keyword"},{"text":" ","kind":"text"},{"text":"AdInteractive","kind":"identifier"}],"navigatorTitle":[{"kind":"identifier","text":"AdInteractive"}],"identifier":"doc:\/\/onevideo.OVKit\/documentation\/OVKit\/AdInteractive"},"doc://onevideo.OVKit/documentation/OVKit/AdInteractive/videoMotion(banner:)":{"role":"symbol","url":"\/documentation\/ovkit\/adinteractive\/videomotion(banner:)","abstract":[],"identifier":"doc:\/\/onevideo.OVKit\/documentation\/OVKit\/AdInteractive\/videoMotion(banner:)","title":"AdInteractive.videoMotion(banner:)","kind":"symbol","type":"topic","fragments":[{"kind":"keyword","text":"case"},{"text":" ","kind":"text"},{"text":"videoMotion","kind":"identifier"},{"text":"(","kind":"text"},{"text":"banner","kind":"externalParam"},{"kind":"text","text":": "},{"text":"MyTargetInstreamAdVideoMotionBanner","preciseIdentifier":"c:@M@OVKit@objc(pl)MyTargetInstreamAdVideoMotionBanner","kind":"typeIdentifier"},{"kind":"text","text":")"}]}}}
{"hierarchy":{"paths":[["doc:\/\/onevideo.OVKit\/documentation\/OVKit"]]},"identifier":{"url":"doc:\/\/onevideo.OVKit\/documentation\/OVKit\/AdInteractive","interfaceLanguage":"swift"},"variants":[{"traits":[{"interfaceLanguage":"swift"}],"paths":["\/documentation\/ovkit\/adinteractive"]}],"metadata":{"symbolKind":"enum","navigatorTitle":[{"kind":"identifier","text":"AdInteractive"}],"externalID":"s:5OVKit13AdInteractiveO","roleHeading":"Enumeration","title":"AdInteractive","fragments":[{"text":"enum","kind":"keyword"},{"text":" ","kind":"text"},{"text":"AdInteractive","kind":"identifier"}],"role":"symbol","modules":[{"name":"OVKit"}]},"kind":"symbol","primaryContentSections":[{"kind":"declarations","declarations":[{"platforms":["iOS"],"tokens":[{"kind":"keyword","text":"enum"},{"text":" ","kind":"text"},{"kind":"identifier","text":"AdInteractive"}],"languages":["swift"]}]}],"sections":[],"schemaVersion":{"major":0,"patch":0,"minor":3},"topicSections":[{"anchor":"Enumeration-Cases","generated":true,"title":"Enumeration Cases","identifiers":["doc:\/\/onevideo.OVKit\/documentation\/OVKit\/AdInteractive\/shoppable(items:)","doc:\/\/onevideo.OVKit\/documentation\/OVKit\/AdInteractive\/videoMotion(banner:)"]}],"references":{"doc://onevideo.OVKit/documentation/OVKit":{"url":"\/documentation\/ovkit","title":"OVKit","role":"collection","abstract":[{"text":"Плеер видео и трансляций для VK Видео.","type":"text"}],"kind":"symbol","identifier":"doc:\/\/onevideo.OVKit\/documentation\/OVKit","type":"topic"},"doc://onevideo.OVKit/documentation/OVKit/AdInteractive/videoMotion(banner:)":{"abstract":[],"kind":"symbol","type":"topic","identifier":"doc:\/\/onevideo.OVKit\/documentation\/OVKit\/AdInteractive\/videoMotion(banner:)","fragments":[{"text":"case","kind":"keyword"},{"text":" ","kind":"text"},{"text":"videoMotion","kind":"identifier"},{"text":"(","kind":"text"},{"kind":"externalParam","text":"banner"},{"kind":"text","text":": "},{"preciseIdentifier":"c:@M@OVKit@objc(pl)MyTargetInstreamAdVideoMotionBanner","kind":"typeIdentifier","text":"MyTargetInstreamAdVideoMotionBanner"},{"kind":"text","text":")"}],"url":"\/documentation\/ovkit\/adinteractive\/videomotion(banner:)","role":"symbol","title":"AdInteractive.videoMotion(banner:)"},"doc://onevideo.OVKit/documentation/OVKit/AdInteractive":{"abstract":[],"kind":"symbol","url":"\/documentation\/ovkit\/adinteractive","identifier":"doc:\/\/onevideo.OVKit\/documentation\/OVKit\/AdInteractive","role":"symbol","fragments":[{"kind":"keyword","text":"enum"},{"kind":"text","text":" "},{"kind":"identifier","text":"AdInteractive"}],"title":"AdInteractive","type":"topic","navigatorTitle":[{"kind":"identifier","text":"AdInteractive"}]},"doc://onevideo.OVKit/documentation/OVKit/AdInteractive/shoppable(items:)":{"fragments":[{"kind":"keyword","text":"case"},{"text":" ","kind":"text"},{"kind":"identifier","text":"shoppable"},{"kind":"text","text":"("},{"text":"items","kind":"externalParam"},{"kind":"text","text":": ["},{"text":"ShoppableAdsItem","kind":"typeIdentifier","preciseIdentifier":"s:5OVKit16ShoppableAdsItemV"},{"text":"])","kind":"text"}],"abstract":[],"kind":"symbol","role":"symbol","title":"AdInteractive.shoppable(items:)","identifier":"doc:\/\/onevideo.OVKit\/documentation\/OVKit\/AdInteractive\/shoppable(items:)","url":"\/documentation\/ovkit\/adinteractive\/shoppable(items:)","type":"topic"}}}
Loading

0 comments on commit ea89bd3

Please sign in to comment.